commit 003ba0aa788ef629b71e1781d73eb1503943d62f
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Nov 04 11:53:16 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Nov 04 13:35:28 2020 +0000
tree f5998b1e12fc5bce59ff3e0012670ca34b7c3c7c
parent ad6a19f4659add52c803f42b0a89a0025d805736

Strengthen testing of private overrides in subtypes

Change-Id: Id97c1e282ea95d0c41da594a2282ef2e39212fa0

src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java

diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
index 11d410f..8624277 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
@@ -139,12 +139,15 @@
             "Base::foo()",
             "Base::foo1()",
             "Base::foo2()",
+            "Base::foo3()",
             "Sub1::foo1()",
             "Itf1::foo1(0) >> Sub1::foo1()",
             "Sub1::bar1(0)",
+            "Sub1::foo3()",
             "Sub2::foo2()",
             "Itf2::foo2(0) >> Sub2::foo2()",
-            "Sub2::bar2(0)");
+            "Sub2::bar2(0)",
+            "Sub2::foo3()");
     Class<?> mainClass = TestMain.class;
     if (parameters.isCfRuntime()) {
       // Only run JVM reference on CF runtimes.

src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Base.java

diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Base.java b/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Base.java
index 4f5becc..0c25396 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Base.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Base.java
@@ -38,10 +38,17 @@
     return foo2();
   }
 
+  @NeverPropagateValue
+  @NeverInline
+  private String foo3() {
+    return "Base::foo3()";
+  }
+
   @NeverInline
   public void dump() {
     System.out.println(foo());
     System.out.println(foo1());
     System.out.println(foo2());
+    System.out.println(foo3());
   }
 }

src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub1.java

diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub1.java b/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub1.java
index b45a708..deb2559 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub1.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub1.java
@@ -23,11 +23,17 @@
     return bar1(1);
   }
 
+  @NeverInline
+  private String foo3() {
+    return "Sub1::foo3()";
+  }
+
   @Override
   public void dump() {
     System.out.println(foo1());
     System.out.println(foo1(0));
     System.out.println(bar1(0));
+    System.out.println(foo3());
   }
 
 }

src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub2.java

diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub2.java b/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub2.java
index fbc2ebc..15cc549 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub2.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/privateinstance/Sub2.java
@@ -32,11 +32,17 @@
     return bar2(2);
   }
 
+  @NeverInline
+  private String foo3() {
+    return "Sub2::foo3()";
+  }
+
   @Override
   public void dump() {
     System.out.println(foo2());
     System.out.println(foo2(0));
     System.out.println(bar2(0));
+    System.out.println(foo3());
     try {
       bar1(0);
     } catch (AssertionError e) {