commit bc203a647a8b6970607e911e77bcdfd1f670c063
author Christoffer Quist Adamsen <christofferqa@google.com> Thu May 09 21:22:41 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri May 10 13:54:30 2019 +0000
tree b14cebfb1ba55d4a68f830db4fcf8daa52d4cdf1
parent b37003ef5c1fb91c80282d3b434cf32a83fb5901

Only insert AssumeDynamicType instructions for methods not returning one of the arguments

Bug: 127461806
Change-Id: If923c53aba5616b9e10bb729a5dd0ba2fcfd190b

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/DynamicTypeOptimization.java b/src/main/java/com/android/tools/r8/ir/optimize/DynamicTypeOptimization.java
index 0f047c1..d90d213 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/DynamicTypeOptimization.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/DynamicTypeOptimization.java
@@ -7,6 +7,7 @@
 import com.android.tools.r8.graph.AppView;
 import com.android.tools.r8.graph.DexEncodedMethod;
 import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.graph.OptimizationInfo;
 import com.android.tools.r8.ir.analysis.type.TypeLatticeElement;
 import com.android.tools.r8.ir.code.Assume;
 import com.android.tools.r8.ir.code.Assume.DynamicTypeAssumption;
@@ -72,8 +73,12 @@
           continue;
         }
 
-        TypeLatticeElement dynamicReturnType =
-            singleTarget.getOptimizationInfo().getDynamicReturnType();
+        OptimizationInfo optimizationInfo = singleTarget.getOptimizationInfo();
+        if (optimizationInfo.returnsArgument()) {
+          continue;
+        }
+
+        TypeLatticeElement dynamicReturnType = optimizationInfo.getDynamicReturnType();
         if (dynamicReturnType == null
             || !dynamicReturnType.strictlyLessThan(outValue.getTypeLattice(), appView)) {
           continue;