diff options
| author |  nharmata <nharmata@google.com> | 2017-05-02 18:16:23 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-05-03 10:56:14 +0200 |
| commit | 5e924aff704b68f5b02c47672e4ac217c7376cf2 (patch) | |
| tree | 22fa87938eb2bbc2592ddc983aee6b6c6d475222 /src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java | |
| parent | 08718159ed47ee689c62d9974583f4d1680c7cdc (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java | 2 |
1 files changed, 1 insertions, 1 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 e427c34085..c0a115ad6c 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 @@ -315,7 +315,7 @@ public class PackageLookupFunction implements SkyFunction { // This checks for the build file names in the correct precedence order. for (BuildFileName buildFileName : buildFilesByPriority) { PathFragment buildFileFragment = - id.getPackageFragment().getChild(buildFileName.getFilename()); + id.getPackageFragment().getRelative(buildFileName.getFilenameFragment()); RootedPath buildFileRootedPath = RootedPath.toRootedPath(repositoryValue.getPath(), buildFileFragment); FileValue fileValue = getFileValue(buildFileRootedPath, env, packageIdentifier); |