diff options
Diffstat (limited to 'src')
6 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java index d4fe8e2cf0..1c3bdfa834 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java @@ -93,7 +93,7 @@ public class ActionExecutionValue implements SkyValue { * towards enqueued and completed actions. */ public static boolean isReportWorthyAction(SkyKey key) { - return key.functionName() == SkyFunctions.ACTION_EXECUTION + return key.functionName().equals(SkyFunctions.ACTION_EXECUTION) && isReportWorthyAction((Action) key.argument()); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java index 2698cd7535..caec042df4 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java @@ -86,7 +86,7 @@ public final class SkyFunctions { return new Predicate<SkyKey>() { @Override public boolean apply(SkyKey key) { - return key.functionName() == functionName; + return key.functionName().equals(functionName); } }; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java index 74794aa50a..ed85621d49 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java @@ -455,7 +455,7 @@ public final class SkyframeBuildView { private class ConfiguredTargetValueInvalidationReceiver implements EvaluationProgressReceiver { @Override public void invalidated(SkyKey skyKey, InvalidationState state) { - if (skyKey.functionName() == SkyFunctions.CONFIGURED_TARGET) { + if (skyKey.functionName().equals(SkyFunctions.CONFIGURED_TARGET)) { if (state == InvalidationState.DELETED) { anyConfiguredTargetDeleted = true; } else { @@ -473,7 +473,7 @@ public final class SkyframeBuildView { @Override public void evaluated(SkyKey skyKey, SkyValue value, EvaluationState state) { - if (skyKey.functionName() == SkyFunctions.CONFIGURED_TARGET && value != null) { + if (skyKey.functionName().equals(SkyFunctions.CONFIGURED_TARGET) && value != null) { switch (state) { case BUILT: evaluatedConfiguredTargets.add(skyKey); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeIncrementalBuildMonitor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeIncrementalBuildMonitor.java index c0fea268f3..144e15221b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeIncrementalBuildMonitor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeIncrementalBuildMonitor.java @@ -35,7 +35,7 @@ class SkyframeIncrementalBuildMonitor { public void accrue(Iterable<SkyKey> invalidatedValues) { for (SkyKey skyKey : invalidatedValues) { - if (skyKey.functionName() == SkyFunctions.FILE_STATE) { + if (skyKey.functionName().equals(SkyFunctions.FILE_STATE)) { RootedPath file = (RootedPath) skyKey.argument(); maybeAddFile(file.getRelativePath()); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java index a1c1968c35..e657a1bf8e 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java @@ -121,7 +121,7 @@ final class SkyframeLabelVisitor implements TransitivePackageLoader { } warnAboutLoadingFailure(topLevelLabel, eventHandler); for (SkyKey badKey : errorInfo.getRootCauses()) { - if (badKey.functionName() == SkyFunctions.PACKAGE) { + if (badKey.functionName().equals(SkyFunctions.PACKAGE)) { // Transitive target function may ask for a Package, but don't include this in the root // causes. We'll get more precise information from dependencies on transitive and direct // target dependencies. diff --git a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java index 8c25d3a2da..9c2f7991b9 100644 --- a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java @@ -339,7 +339,7 @@ public class EagerInvalidatorTest { if (skyKey.equals(child)) { // Interrupt on the very first invalidate mainThread.interrupt(); - } else if (skyKey.functionName() != NODE_TYPE) { + } else if (!skyKey.functionName().equals(NODE_TYPE)) { // All other invalidations should have the GraphTester's key type. // Exceptions thrown here may be silently dropped, so keep track of errors ourselves. badKey.set(skyKey); |