diff options
| author |  tomlu <tomlu@google.com> | 2018-01-19 10:25:19 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-19 10:27:24 -0800 |
| commit | e7552c53a5dd65ae496562fc29adecd89e9db5fb (patch) | |
| tree | f33fb86896b10777b5652812d161454a2cefbe6c /src/main/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 26866939e115798cf91d7a02de5417ad81314384 (diff) | |
Fix usages of PathFragment segments that will become inefficient.
An upcoming replacement to PathFragment will not have efficient segment semantics, causing code to become unnecessarily inefficient.
RELNOTES: None
PiperOrigin-RevId: 182553098
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index 6737c6c986..7b549540a4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java @@ -487,7 +487,7 @@ public final class CcCommon { ruleContext.attributeError("includes", "Path references a path above the execution root."); } - if (includesPath.segmentCount() == 0) { + if (includesPath.isEmpty()) { ruleContext.attributeError( "includes", "'" diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index 7bede6cf39..284be8cd10 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -893,7 +893,7 @@ public class CppCompileAction extends AbstractAction } // Need to do dir/package matching: first try a quick exact lookup. PathFragment includeDir = input.getRootRelativePath().getParentDirectory(); - if (includeDir.segmentCount() == 0 || declaredIncludeDirs.contains(includeDir)) { + if (includeDir.isEmpty() || declaredIncludeDirs.contains(includeDir)) { return true; // OK: quick exact match. } // Not found in the quick lookup: try the wildcards. |