Copy local info when inserting constant value Bug: 137484867 Change-Id: I87978fda1b58c3eef65e7414380e22c46a84a000
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java index 45d9af3..6152ee5 100644 --- a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java +++ b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
@@ -216,6 +216,11 @@ if (prototypeChanges.hasBeenChangedToReturnVoid() && invoke.outValue() != null) { constantReturnMaterializingInstruction = prototypeChanges.getConstantReturn(code, invoke.getPosition()); + if (invoke.outValue().hasLocalInfo()) { + constantReturnMaterializingInstruction + .outValue() + .setLocalInfo(invoke.outValue().getLocalInfo()); + } invoke.outValue().replaceUsers(constantReturnMaterializingInstruction.outValue()); }