commit 7c2dd0d965ca5407cbcb61b9c5253c028741aa77
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Dec 06 13:21:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 06 13:21:45 2018 +0000
tree 0791e0d6ff7da083d1c2040d9e3c6a8d693a4898
parent e65ae1d162f0e15da60dcfa310d4f2bf5b0e0d57
parent 597de202de56d380e4eea14c66355594c05a80ad

Merge "Update class inliner to check for effectively-final instead of final"

src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
index ade48f3..7754a14 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
@@ -197,8 +197,11 @@
     //      of class inlining
     //
 
-    if (eligibleClassDefinition.instanceFields().length > 0 ||
-        !eligibleClassDefinition.accessFlags.isFinal()) {
+    if (eligibleClassDefinition.instanceFields().length > 0) {
+      return false;
+    }
+    if (eligibleClassDefinition.type.hasSubtypes()) {
+      assert !eligibleClassDefinition.accessFlags.isFinal();
       return false;
     }