Replace ref equality with .equals for SkyFunctionNames
Ref equality for same-name SkyFunctionNames is not guaranteed.
--
MOS_MIGRATED_REVID=100322275
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 d4fe8e2..1c3bdfa 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 @@
* 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 2698cd7..caec042 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 @@
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 74794aa..ed85621 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 @@
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 @@
@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 c0fea26..144e152 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 @@
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 a1c1968..e657a1b 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 @@
}
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.
