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/repository | |
| 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/repository')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java index 8d7e3eb5b2..490b1f6324 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java @@ -100,7 +100,7 @@ public class LocalRepositoryFunction extends RepositoryFunction { directory.getRoot(), directory .getRelativePath() - .getRelative(PackageLookupValue.BuildFileName.WORKSPACE.getFilenameFragment())); + .getChild(PackageLookupValue.BuildFileName.WORKSPACE.getFilename())); SkyKey workspaceFileKey = FileValue.key(workspaceRootedFile); FileValue value; diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java index e6f3837212..20c26b5942 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java @@ -473,7 +473,8 @@ public abstract class RepositoryFunction { if (repositoryPath.segmentCount() > 1) { if (rule.getRuleClass().equals(LocalRepositoryRule.NAME) - && repositoryPath.endsWith(BuildFileName.WORKSPACE.getFilenameFragment())) { + && repositoryPath.endsWith( + PathFragment.create(BuildFileName.WORKSPACE.getFilename()))) { // Ignore this, there is a dependency from LocalRepositoryFunction->WORKSPACE file already return; } |