commit b19b7dd8603583efddd57260dbf42163305aa4fd
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Mar 03 23:59:31 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Mar 03 23:00:23 2020 +0000
tree 2d813546c334f835564086ded69be2d19a6c9efc
parent b204e87c24ab169e345e18a327199192c1c38c25

Update tests to reflect correct lookup targets

The test has the following:
A {
  void m1() { ... }
}

B extends A {
  private void m1() { ... }
}

Main {
 main() {
   new A().m1;
   A b = new B();
   invoke-virtual b.m1;
 }
}

Interestingly, since we now have proper lookup, we can now
class-inline A and since there is no A.m1, lookup-virtual will now
fail. The old algorithm would see multiple definitions and not remove
the definition.

Change-Id: I92a612a37490b03613e6045f96682d803ceae952

src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java b/src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java
index 5220c01..8673412 100644
--- a/src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java
@@ -169,7 +169,8 @@
   @Test
   public void test() throws Exception {
     // Run the program on Art after is has been compiled with R8.
-    String referenceResult = expectedResults.apply(isDexVmBetween5_1_1and7_0_0(parameters));
+    String referenceResult =
+        expectedResults.apply(!enableClassInlining && isDexVmBetween5_1_1and7_0_0(parameters));
     R8TestCompileResult compiled =
         compilationResults.apply(
             new Dimensions(