Automated rollback of commit 82e68b75304438c96ff878a0c2b8d18b42002486.

Fixes #4322, #4306.

*** Reason for rollback ***

Introduces a deadlock (see https://github.com/bazelbuild/bazel/issues/4322)

*** Original change description ***

Make FileSystem operate on LocalPath instead of Path.

PiperOrigin-RevId: 179549866

2 files changed, 3 insertions, 6 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
index 7f1f342d5e..bbb8be7e82 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
@@ -28,7 +28,6 @@ import com.google.devtools.build.lib.packages.util.PackageFactoryApparatus;
 import com.google.devtools.build.lib.packages.util.PackageFactoryTestBase;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.testutil.TestUtils;
-import com.google.devtools.build.lib.vfs.LocalPath;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.ArrayList;
@@ -1000,7 +999,7 @@ public class PackageFactoryTest extends PackageFactoryTestBase {
         scratch.file("/e/BUILD", "sh_library(name = 'e', data = glob(['*.txt']))");
     Path parentDir = buildFile.getParentDirectory();
     scratch.file("/e/data.txt");
-    throwOnReaddir = LocalPath.create(parentDir.getPathString());
+    throwOnReaddir = parentDir;
     try {
       packages.createPackage("e", buildFile);
     } catch (NoSuchPackageException expected) {
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java
index fa5e7605ac..eb614fc49c 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java
@@ -39,7 +39,6 @@ import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.vfs.Dirent;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
-import com.google.devtools.build.lib.vfs.LocalPath;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 import java.io.FileNotFoundException;
@@ -81,7 +80,7 @@ public abstract class PackageFactoryTestBase {
 
   protected abstract PackageFactoryApparatus createPackageFactoryApparatus();
 
-  protected LocalPath throwOnReaddir = null;
+  protected Path throwOnReaddir = null;
 
   protected static AttributeMap attributes(Rule rule) {
     return RawAttributeMapper.of(rule);
@@ -123,8 +122,7 @@ public abstract class PackageFactoryTestBase {
     FileSystem fs =
         new InMemoryFileSystem() {
           @Override
-          public Collection<Dirent> readdir(LocalPath path, boolean followSymlinks)
-              throws IOException {
+          public Collection<Dirent> readdir(Path path, boolean followSymlinks) throws IOException {
             if (path.equals(throwOnReaddir)) {
               throw new FileNotFoundException(path.getPathString());
             }