commit 6e2d439a52057df367533e14992a70812721292a
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 05 10:17:24 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 05 10:17:24 2019 +0200
tree 6afde4174c9797106f7968fbe995b539477c96d3
parent cfb96799497ad78ca35ae0287fc5f5c1d8eed8f4

Synthesize throwing body when merging abstract method to non-abstract class

Change-Id: I4a94a2b75ea79e3f7001d9afcddc675dc1f009d6

src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
index b44ad18..0b8569c 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -590,6 +590,12 @@
     return generateCodeFromTemplate(1, 0, insn);
   }
 
+  public DexEncodedMethod toEmptyThrowingMethod(InternalOptions options) {
+    return options.isGeneratingClassFiles()
+        ? toEmptyThrowingMethodCf()
+        : toEmptyThrowingMethodDex();
+  }
+
   public DexEncodedMethod toEmptyThrowingMethodDex() {
     checkIfObsolete();
     assert !shouldNotHaveCode();

src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index 96403ab..e1f379e 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -953,6 +953,12 @@
             // Update the holder of [virtualMethod] using renameMethod().
             DexEncodedMethod resultingVirtualMethod =
                 renameMethod(virtualMethod, availableMethodSignatures, Rename.NEVER);
+            if (appView.options().canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug()
+                && !target.isAbstract()) {
+              resultingVirtualMethod.accessFlags.unsetAbstract();
+              resultingVirtualMethod =
+                  resultingVirtualMethod.toEmptyThrowingMethod(appView.options());
+            }
             deferredRenamings.map(virtualMethod.method, resultingVirtualMethod.method);
             deferredRenamings.recordMove(virtualMethod.method, resultingVirtualMethod.method);
             add(virtualMethods, resultingVirtualMethod, MethodSignatureEquivalence.get());