diff options
| author |  dmarting <dmarting@google.com> | 2017-05-02 14:23:36 +0200 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2017-05-02 15:44:33 +0200 |
| commit | 7beadb7277453efec7e12b925005e7f0e003b592 (patch) | |
| tree | ab5ebab351566289fb5f0f1f44023c8b038f40e9 /src/main/java/com/google/devtools/build/lib/actions/Artifact.java | |
| parent | adb15a606e42dc4feac03353c8b2587c5d3c78c6 (diff) | |
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: 154821457
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions/Artifact.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/Artifact.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java index 74c7682f09..7c6a87087b 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java +++ b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java @@ -543,7 +543,8 @@ public class Artifact */ public final PathFragment getRunfilesPath() { PathFragment relativePath = rootRelativePath; - if (relativePath.startsWith(Label.EXTERNAL_PATH_PREFIX)) { + if (relativePath.segmentCount() > 1 + && relativePath.getSegment(0).equals(Label.EXTERNAL_PATH_PREFIX)) { // Turn external/repo/foo into ../repo/foo. relativePath = relativePath.relativeTo(Label.EXTERNAL_PATH_PREFIX); relativePath = PathFragment.create("..").getRelative(relativePath); |