Disable missing slot reporting when reading stack map phi types
Bug: 169346184
Change-Id: I80271d4f5a3a227d521ea3b2344f484b403e6562
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java b/src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java
index 6deea80..4902c0e 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java
@@ -716,16 +716,17 @@
return localVariablesWithRegister.get(0).getLocal().type;
}
}
- appView
- .options()
- .reporter
- .warning(
- new CfCodeDiagnostics(
- origin,
- method.getReference(),
- "Could not find phi type for register "
- + register
- + ". This is most likely due to invalid stack maps in input."));
+ // TODO(b/169346184): Delay reporting errors here due to invalid debug info until resolved.
+ // appView
+ // .options()
+ // .reporter
+ // .warning(
+ // new CfCodeDiagnostics(
+ // origin,
+ // method.getReference(),
+ // "Could not find phi type for register "
+ // + register
+ // + ". This is most likely due to invalid stack maps in input."));
return null;
}
if (slot.isPrecise()) {
diff --git a/src/test/java/com/android/tools/r8/SwitchDebugLocalsConflictTest.java b/src/test/java/com/android/tools/r8/SwitchDebugLocalsConflictTest.java
index 7a679e5..7a76f4a 100644
--- a/src/test/java/com/android/tools/r8/SwitchDebugLocalsConflictTest.java
+++ b/src/test/java/com/android/tools/r8/SwitchDebugLocalsConflictTest.java
@@ -39,8 +39,6 @@
diagnotics.assertNoErrors();
diagnotics.assertInfoThatMatches(
diagnosticMessage(containsString("invalid locals information")));
- diagnotics.assertAllWarningsMatch(
- diagnosticMessage(containsString("Could not find phi type for register 14")));
});
}
diff --git a/src/test/java/com/android/tools/r8/ir/DebugLocalStartOutsideRangeTest.java b/src/test/java/com/android/tools/r8/ir/DebugLocalStartOutsideRangeTest.java
index cfd20ab..ac6d2dd 100644
--- a/src/test/java/com/android/tools/r8/ir/DebugLocalStartOutsideRangeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/DebugLocalStartOutsideRangeTest.java
@@ -43,10 +43,8 @@
.setMinApi(parameters.getApiLevel())
.compileWithExpectedDiagnostics(
diagnostics -> {
- if (parameters.isDexRuntime()) {
- diagnostics.assertWarningThatMatches(
- diagnosticMessage(containsString("Could not find phi type for register")));
- }
+ diagnostics.assertNoWarningsMatch(
+ diagnosticMessage(containsString("Could not find phi type for register")));
});
}
