commit 2d7764f7614ed8a8ca5979cb5557f7eee47e2fa4
author Ian Zerny <zerny@google.com> Thu May 28 06:45:02 2020 +0200
committer Ian Zerny <zerny@google.com> Thu May 28 04:46:02 2020 +0000
tree 48cda65e6fb46a9044424d56d4a9f4209bc36d9c
parent 7bfeea9e5bf5dcd2421d4d8363ba613137745afe

Preserve local info in assertion rewriter.

Change-Id: I1eb979dde012a12bceba6c6b84560414cc686374

src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java
index 81b43ef..e4b35af 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java
@@ -340,7 +340,7 @@
           if (method.holder() == dexItemFactory.kotlin.assertions.type) {
             rewriteKotlinAssertionEnable(code, transformation, iterator, invoke);
           } else {
-            iterator.replaceCurrentInstruction(code.createIntConstant(0));
+            iterator.replaceCurrentInstruction(code.createIntConstant(0, current.getLocalInfo()));
           }
         }
       } else if (current.isStaticPut()) {
@@ -355,13 +355,16 @@
         if (isInitializerEnablingJavaVmAssertions
             && staticGet.getField().name == dexItemFactory.assertionsDisabled) {
           iterator.replaceCurrentInstruction(
-              code.createIntConstant(transformation == AssertionTransformation.DISABLE ? 1 : 0));
+              code.createIntConstant(
+                  transformation == AssertionTransformation.DISABLE ? 1 : 0,
+                  current.getLocalInfo()));
         }
         // Rewrite kotlin._Assertions.ENABLED getter.
         if (staticGet.getField() == dexItemFactory.kotlin.assertions.enabledField) {
           iterator.replaceCurrentInstruction(
               code.createIntConstant(
-                  kotlinTransformation == AssertionTransformation.DISABLE ? 0 : 1));
+                  kotlinTransformation == AssertionTransformation.DISABLE ? 0 : 1,
+                  current.getLocalInfo()));
         }
       }
     }