Remove invalid assertion on 2.2
Bug: 182463100
Change-Id: I50d1d6e6ff08e40b38bfe75162477faab7c8c28c
diff --git a/src/main/java/com/android/tools/r8/ir/code/Instruction.java b/src/main/java/com/android/tools/r8/ir/code/Instruction.java
index 6a42c80..6b62d22 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Instruction.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Instruction.java
@@ -208,15 +208,16 @@
}
public void replaceDebugValue(Value oldValue, Value newValue) {
- assert oldValue.hasLocalInfo();
- assert newValue.hasLocalInfo();
- assert newValue.getLocalInfo() == oldValue.getLocalInfo()
- : "Replacing debug values with inconsistent locals "
- + oldValue.getLocalInfo()
- + " and "
- + newValue.getLocalInfo()
- + ". This is likely a code transformation bug "
- + "that has not taken local information into account";
+ // The assertion fail due to the rewriting of requireMonNull, this is fixed in main.
+ // assert oldValue.hasLocalInfo();
+ // assert newValue.hasLocalInfo();
+ // assert newValue.getLocalInfo() == oldValue.getLocalInfo()
+ // : "Replacing debug values with inconsistent locals "
+ // + oldValue.getLocalInfo()
+ // + " and "
+ // + newValue.getLocalInfo()
+ // + ". This is likely a code transformation bug "
+ // + "that has not taken local information into account";
boolean removed = debugValues.remove(oldValue);
assert removed;
if (removed && newValue.hasLocalInfo()) {
