Fix WORKSPACE file lookup to look at all package paths

--
MOS_MIGRATED_REVID=89713328

1 files changed, 43 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
index 775deda07b..15025b8f3d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
@@ -17,6 +17,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.cmdline.LabelValidator;
 import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException;
 import com.google.devtools.build.lib.packages.BuildFileNotFoundException;
+import com.google.devtools.build.lib.packages.ExternalPackage;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.PackageIdentifier;
 import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -52,6 +53,8 @@ class PackageLookupFunction implements SkyFunction {
     PackageIdentifier packageKey = (PackageIdentifier) skyKey.argument();
     if (!packageKey.getRepository().isDefault()) {
       return computeExternalPackageLookupValue(skyKey, env);
+    } else if (packageKey.getPackageFragment().equals(new PathFragment(ExternalPackage.NAME))) {
+      return computeWorkspaceLookupValue(env);
     }
     PathFragment pkg = packageKey.getPackageFragment();
     String pkgName = pkg.getPathString();
@@ -84,18 +87,9 @@ class PackageLookupFunction implements SkyFunction {
     return null;
   }
 
-  private PackageLookupValue getPackageLookupValue(Environment env, Path packagePathEntry,
-      PathFragment pkgFragment) throws PackageLookupFunctionException {
-    PathFragment buildFileFragment;
-    boolean isWorkspace = false;
-    if (pkgFragment.getPathString().equals(PackageFunction.EXTERNAL_PACKAGE_NAME)) {
-      buildFileFragment = new PathFragment("WORKSPACE");
-      isWorkspace = true;
-    } else {
-      buildFileFragment = pkgFragment.getChild("BUILD");
-    }
-    RootedPath buildFileRootedPath = RootedPath.toRootedPath(packagePathEntry,
-        buildFileFragment);
+  @Nullable
+  private FileValue getFileValue(RootedPath buildFileRootedPath, Environment env)
+      throws PackageLookupFunctionException {
     String basename = buildFileRootedPath.asPath().getBaseName();
     SkyKey fileSkyKey = FileValue.key(buildFileRootedPath);
     FileValue fileValue = null;
@@ -103,13 +97,13 @@ class PackageLookupFunction implements SkyFunction {
       fileValue = (FileValue) env.getValueOrThrow(fileSkyKey, IOException.class,
           FileSymlinkCycleException.class, InconsistentFilesystemException.class);
     } catch (IOException e) {
-      String pkgName = pkgFragment.getPathString();
+      String pkgName = buildFileRootedPath.getRelativePath().getParentDirectory().getPathString();
       // TODO(bazel-team): throw an IOException here and let PackageFunction wrap that into a
       // BuildFileNotFoundException.
       throw new PackageLookupFunctionException(new BuildFileNotFoundException(pkgName,
           "IO errors while looking for " + basename + " file reading "
               + buildFileRootedPath.asPath() + ": " + e.getMessage(), e),
-           Transience.PERSISTENT);
+          Transience.PERSISTENT);
     } catch (FileSymlinkCycleException e) {
       String pkgName = buildFileRootedPath.asPath().getPathString();
       throw new PackageLookupFunctionException(new BuildFileNotFoundException(pkgName,
@@ -120,10 +114,19 @@ class PackageLookupFunction implements SkyFunction {
       // This error is not transient from the perspective of the PackageLookupFunction.
       throw new PackageLookupFunctionException(e, Transience.PERSISTENT);
     }
+    return fileValue;
+  }
+
+  private PackageLookupValue getPackageLookupValue(Environment env, Path packagePathEntry,
+      PathFragment pkgFragment) throws PackageLookupFunctionException {
+    PathFragment buildFileFragment = pkgFragment.getChild("BUILD");
+    RootedPath buildFileRootedPath = RootedPath.toRootedPath(packagePathEntry,
+        buildFileFragment);
+    FileValue fileValue = getFileValue(buildFileRootedPath, env);
     if (fileValue == null) {
       return null;
     }
-    if (fileValue.isFile() || isWorkspace) {
+    if (fileValue.isFile()) {
       return PackageLookupValue.success(buildFileRootedPath.getRoot());
     }
     return PackageLookupValue.noBuildFile();
@@ -157,6 +160,31 @@ class PackageLookupFunction implements SkyFunction {
   }
 
   /**
+   * Look for a WORKSPACE file on each package path.  If none is found, use the last package path
+   * and pretend it was found there.
+   */
+  private SkyValue computeWorkspaceLookupValue(Environment env)
+      throws PackageLookupFunctionException {
+    PathPackageLocator pkgLocator = PrecomputedValue.PATH_PACKAGE_LOCATOR.get(env);
+    Path lastPackagePath = null;
+    for (Path packagePathEntry : pkgLocator.getPathEntries()) {
+      lastPackagePath = packagePathEntry;
+      RootedPath workspacePath = RootedPath.toRootedPath(
+          packagePathEntry, new PathFragment("WORKSPACE"));
+      FileValue value = getFileValue(workspacePath, env);
+      if (value == null) {
+        return null;
+      }
+      if (value.exists()) {
+        return PackageLookupValue.workspace(packagePathEntry);
+      }
+    }
+
+    // Fall back on the last package path entry if there were any and nothing else worked.
+    return PackageLookupValue.workspace(lastPackagePath);
+  }
+
+  /**
    * Used to declare all the exception types that can be wrapped in the exception thrown by
    * {@link PackageLookupFunction#compute}.
    */