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/rules/objc | |
| 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/rules/objc')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java index ba324e670d..8de811fe03 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java @@ -34,8 +34,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; // TODO(bazel-team): This should really be named DerivedArtifacts as it contains methods for // final as well as intermediate artifacts. public final class IntermediateArtifacts { - private static final PathFragment OBJS = PathFragment.create("_objs"); - static final String LINKMAP_SUFFIX = ".linkmap"; /** @@ -277,7 +275,8 @@ public final class IntermediateArtifacts { } private Artifact inUniqueObjsDir(Artifact source, String extension) { - PathFragment uniqueDir = OBJS.getRelative(ruleContext.getLabel().getName()); + PathFragment uniqueDir = + PathFragment.create("_objs").getRelative(ruleContext.getLabel().getName()); PathFragment sourceFile = uniqueDir.getRelative(source.getRootRelativePath()); PathFragment scopeRelativePath = FileSystemUtils.replaceExtension(sourceFile, extension); return scopedArtifact(scopeRelativePath); |