Remove incorrect preconditions checks when resolving artifacts.

--
MOS_MIGRATED_REVID=100501490

1 files changed, 7 insertions, 13 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java b/src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java
index d868816d49..300e382de8 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ArtifactFactory.java
@@ -320,25 +320,19 @@ public class ArtifactFactory implements ArtifactResolver, ArtifactSerializer, Ar
 
   @Nullable
   private Root findSourceRoot(
-      PathFragment execPath, PathFragment baseExecPath, @Nullable Root baseRoot) {
-    Preconditions.checkState(
-        baseExecPath == null
-            || (execPath.startsWith(baseExecPath) && !execPath.equals(baseExecPath)),
-        "%s %s %s",
-        execPath,
-        baseExecPath,
-        baseRoot);
-    // Probe the known packages to find the longest package prefix up until the base.
-    for (PathFragment dir = execPath.getParentDirectory();
-        !Objects.equals(dir, baseExecPath);
+      PathFragment execPath, @Nullable PathFragment baseExecPath, @Nullable Root baseRoot) {
+    // Probe the known packages to find the longest package prefix up until the base, or until the
+    // root directory if our execPath doesn't start with baseExecPath due to uplevel references.
+    PathFragment dir;
+    for (dir = execPath.getParentDirectory();
+        dir != null && !dir.equals(baseExecPath);
         dir = dir.getParentDirectory()) {
-      Preconditions.checkNotNull(dir, "%s %s %s", execPath, baseExecPath, baseRoot);
       Root sourceRoot = packageRoots.get(PackageIdentifier.createInDefaultRepo(dir));
       if (sourceRoot != null) {
         return sourceRoot;
       }
     }
-    return baseRoot;
+    return dir != null && dir.equals(baseExecPath) ? baseRoot : null;
   }
 
   @Override