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/rules/repository | |
| 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/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, 2 insertions, 3 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 490b1f6324..8d7e3eb5b2 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() - .getChild(PackageLookupValue.BuildFileName.WORKSPACE.getFilename())); + .getRelative(PackageLookupValue.BuildFileName.WORKSPACE.getFilenameFragment())); 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 20c26b5942..e6f3837212 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,8 +473,7 @@ public abstract class RepositoryFunction { if (repositoryPath.segmentCount() > 1) { if (rule.getRuleClass().equals(LocalRepositoryRule.NAME) - && repositoryPath.endsWith( - PathFragment.create(BuildFileName.WORKSPACE.getFilename()))) { + && repositoryPath.endsWith(BuildFileName.WORKSPACE.getFilenameFragment())) { // Ignore this, there is a dependency from LocalRepositoryFunction->WORKSPACE file already return; } |