From 5e924aff704b68f5b02c47672e4ac217c7376cf2 Mon Sep 17 00:00:00 2001 From: nharmata Date: Tue, 2 May 2017 18:16:23 +0200 Subject: 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 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index 41afb816ff..aa719c80ed 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -60,6 +60,8 @@ import javax.annotation.Nullable; *

This class can be used only after the loading phase. */ public class CppHelper { + static final PathFragment OBJS = PathFragment.create("_objs"); + private static final String GREPPED_INCLUDES_SUFFIX = ".includes"; // TODO(bazel-team): should this use Link.SHARED_LIBRARY_FILETYPES? @@ -283,7 +285,7 @@ public class CppHelper { * Returns the directory where object files are created. */ public static PathFragment getObjDirectory(Label ruleLabel) { - return AnalysisUtils.getUniqueDirectory(ruleLabel, PathFragment.create("_objs")); + return AnalysisUtils.getUniqueDirectory(ruleLabel, OBJS); } /** -- cgit v1.2.3