Automated g4 rollback of commit 7beadb7277453efec7e12b925005e7f0e003b592.

*** Reason for rollback ***

Original CL was rolled backed incorrectly. See post-submit discussion on http://https://github.com/bazelbuild/bazel/commit/7beadb7277453efec7e12b925005e7f0e003b592.

*** Original change description ***

Automated g4 rollback of commit 38b835097f9ae9a6062172b8a33ec2e2d1edde20.

*** Reason for rollback ***

Breaking Bazel build on linux, see http://ci.bazel.io/job/bazel-tests/733/

Repro: bazel build //src/test/java/com/google/devtools/build/lib:packages_test

Found by bisecting.

*** Original change description ***

Only allocate some formerly frequently allocated PathFragment objects once.

This reduces both gc churn and retained memory usage.

RELNOTES: None
PiperOrigin-RevId: 154839279

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
index 5ed0e55e5c..79f6a41679 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
@@ -43,32 +43,32 @@ public abstract class PackageLookupValue implements SkyValue {
     WORKSPACE("WORKSPACE") {
       @Override
       public PathFragment getBuildFileFragment(PackageIdentifier packageIdentifier) {
-        return PathFragment.create(BuildFileName.WORKSPACE.getFilename());
+        return getFilenameFragment();
       }
     },
     BUILD("BUILD") {
       @Override
       public PathFragment getBuildFileFragment(PackageIdentifier packageIdentifier) {
-        return packageIdentifier.getPackageFragment().getChild(getFilename());
+        return packageIdentifier.getPackageFragment().getRelative(getFilenameFragment());
       }
     },
     BUILD_DOT_BAZEL("BUILD.bazel") {
       @Override
       public PathFragment getBuildFileFragment(PackageIdentifier packageIdentifier) {
-        return packageIdentifier.getPackageFragment().getChild(getFilename());
+        return packageIdentifier.getPackageFragment().getRelative(getFilenameFragment());
       }
     };
 
     private static final BuildFileName[] VALUES = BuildFileName.values();
 
-    private final String filename;
+    private final PathFragment filenameFragment;
 
     private BuildFileName(String filename) {
-      this.filename = filename;
+      this.filenameFragment = PathFragment.create(filename);
     }
 
-    public String getFilename() {
-      return filename;
+    public PathFragment getFilenameFragment() {
+      return filenameFragment;
     }
 
     /**