Add a test for non-rebound field references with vertical class merging
Change-Id: I28689fe619806fc488d8488322318a29e4ba6d65
diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index e73dec3..4149659 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -18,6 +18,7 @@
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.ThrowingOutputStream;
import com.android.tools.r8.utils.codeinspector.EnumUnboxingInspector;
+import com.android.tools.r8.utils.codeinspector.HorizontallyMergedClassesInspector;
import com.android.tools.r8.utils.codeinspector.HorizontallyMergedLambdaClassesInspector;
import com.android.tools.r8.utils.codeinspector.VerticallyMergedClassesInspector;
import com.google.common.base.Suppliers;
@@ -114,6 +115,17 @@
inspector.accept(new EnumUnboxingInspector(dexItemFactory, unboxedEnums))));
}
+ public T addHorizontallyMergedClassesInspector(
+ Consumer<HorizontallyMergedClassesInspector> inspector) {
+ return addOptionsModification(
+ options ->
+ options.testing.horizontallyMergedClassesConsumer =
+ ((dexItemFactory, horizontallyMergedClasses) ->
+ inspector.accept(
+ new HorizontallyMergedClassesInspector(
+ dexItemFactory, horizontallyMergedClasses))));
+ }
+
public T addHorizontallyMergedLambdaClassesInspector(
Consumer<HorizontallyMergedLambdaClassesInspector> inspector) {
return addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java
index 627c2d2..3581801 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java
@@ -31,10 +31,11 @@
.addKeepMainRule(Main.class)
.addOptionsModification(
options -> options.enableHorizontalClassMerging = enableHorizontalClassMerging)
- .addHorizontallyMergedLambdaClassesInspector(
+ .addHorizontallyMergedClassesInspector(
inspector -> {
if (enableHorizontalClassMerging) {
inspector.assertMerged(HelloGreeting.class, WorldGreeting.class);
+ inspector.assertMergedIntoDifferentType(WorldGreeting.class);
}
})
.enableNeverClassInliningAnnotations()
@@ -49,15 +50,15 @@
static class Main {
public static void main(String[] args) {
- System.out.print(new C(new HelloGreeting()).greeting);
- System.out.println(new WorldGreeting());
+ System.out.print(new HelloGreeting());
+ System.out.println(new C(new WorldGreeting()).greeting);
}
}
@NeverClassInline
static class C extends NonReboundFieldAccessWithMergedTypeTestClasses.B {
- public C(HelloGreeting greeting) {
+ public C(WorldGreeting greeting) {
super(greeting);
}
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
index 7bf88cf..0aaf197 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
@@ -18,6 +18,7 @@
}
}
+ @NoVerticalClassMerging
public static class B extends A {
public B(String greeting) {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
index 96e80b9..ce3354e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
@@ -6,7 +6,7 @@
import com.android.tools.r8.NoHorizontalClassMerging;
import com.android.tools.r8.NoVerticalClassMerging;
-import com.android.tools.r8.classmerging.horizontal.NonReboundFieldAccessWithMergedTypeTest.HelloGreeting;
+import com.android.tools.r8.classmerging.horizontal.NonReboundFieldAccessWithMergedTypeTest.WorldGreeting;
public class NonReboundFieldAccessWithMergedTypeTestClasses {
@@ -14,9 +14,9 @@
@NoVerticalClassMerging
static class A {
- public HelloGreeting greeting;
+ public WorldGreeting greeting;
- A(HelloGreeting greeting) {
+ A(WorldGreeting greeting) {
this.greeting = greeting;
}
}
@@ -24,7 +24,7 @@
@NoVerticalClassMerging
public static class B extends A {
- public B(HelloGreeting greeting) {
+ public B(WorldGreeting greeting) {
super(greeting);
}
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java
new file mode 100644
index 0000000..ecf49fc
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java
@@ -0,0 +1,70 @@
+// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.classmerging.vertical;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.classmerging.vertical.NonReboundFieldAccessWithMergedTypeTest.GreetingBase;
+import com.android.tools.r8.classmerging.vertical.testclasses.NonReboundFieldAccessOnMergedClassTestClasses;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class NonReboundFieldAccessOnMergedClassTest extends TestBase {
+
+ private final TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection params() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public NonReboundFieldAccessOnMergedClassTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void test() throws Exception {
+ thrown.expect(Throwable.class);
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addInnerClasses(NonReboundFieldAccessOnMergedClassTestClasses.class)
+ .addKeepMainRule(Main.class)
+ .addVerticallyMergedClassesInspector(
+ inspector -> inspector.assertMergedIntoSubtype(GreetingBase.class))
+ .enableNeverClassInliningAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("Hello world!");
+ }
+
+ static class Main {
+
+ public static void main(String[] args) {
+ C c = new D("Hello world!");
+ System.out.println(c.greeting);
+ }
+ }
+
+ static class C extends NonReboundFieldAccessOnMergedClassTestClasses.B {
+
+ public C(String greeting) {
+ super(greeting);
+ }
+ }
+
+ @NeverClassInline
+ static class D extends C {
+
+ public D(String greeting) {
+ super(greeting);
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java
new file mode 100644
index 0000000..5a3f831
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java
@@ -0,0 +1,72 @@
+// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.classmerging.vertical;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.classmerging.vertical.testclasses.NonReboundFieldAccessWithMergedTypeTestClasses;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class NonReboundFieldAccessWithMergedTypeTest extends TestBase {
+
+ private final TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection params() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public NonReboundFieldAccessWithMergedTypeTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void test() throws Exception {
+ thrown.expect(Throwable.class);
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addInnerClasses(NonReboundFieldAccessWithMergedTypeTestClasses.class)
+ .addKeepMainRule(Main.class)
+ .addVerticallyMergedClassesInspector(
+ inspector -> inspector.assertMergedIntoSubtype(GreetingBase.class))
+ .enableNeverClassInliningAnnotations()
+ .enableNoVerticalClassMergingAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("Hello world!");
+ }
+
+ static class Main {
+
+ public static void main(String[] args) {
+ System.out.println(new C(new Greeting()).greeting);
+ }
+ }
+
+ @NeverClassInline
+ static class C extends NonReboundFieldAccessWithMergedTypeTestClasses.B {
+
+ public C(GreetingBase greeting) {
+ super(greeting);
+ }
+ }
+
+ public static class GreetingBase {}
+
+ public static class Greeting extends GreetingBase {
+
+ @Override
+ public String toString() {
+ return "Hello world!";
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java b/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
new file mode 100644
index 0000000..7653f54
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessOnMergedClassTestClasses.java
@@ -0,0 +1,27 @@
+// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.classmerging.vertical.testclasses;
+
+import com.android.tools.r8.NoVerticalClassMerging;
+
+public class NonReboundFieldAccessOnMergedClassTestClasses {
+
+ @NoVerticalClassMerging
+ static class A {
+
+ public String greeting;
+
+ A(String greeting) {
+ this.greeting = greeting;
+ }
+ }
+
+ public static class B extends A {
+
+ public B(String greeting) {
+ super(greeting);
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java b/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
new file mode 100644
index 0000000..aac0481
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/testclasses/NonReboundFieldAccessWithMergedTypeTestClasses.java
@@ -0,0 +1,29 @@
+// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.classmerging.vertical.testclasses;
+
+import com.android.tools.r8.NoVerticalClassMerging;
+import com.android.tools.r8.classmerging.vertical.NonReboundFieldAccessWithMergedTypeTest.GreetingBase;
+
+public class NonReboundFieldAccessWithMergedTypeTestClasses {
+
+ @NoVerticalClassMerging
+ static class A {
+
+ public GreetingBase greeting;
+
+ A(GreetingBase greeting) {
+ this.greeting = greeting;
+ }
+ }
+
+ @NoVerticalClassMerging
+ public static class B extends A {
+
+ public B(GreetingBase greeting) {
+ super(greeting);
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/EnumUnboxingInspector.java b/src/test/java/com/android/tools/r8/utils/codeinspector/EnumUnboxingInspector.java
index 2ca4579..8e5495e 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/EnumUnboxingInspector.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/EnumUnboxingInspector.java
@@ -26,7 +26,8 @@
return this;
}
- public EnumUnboxingInspector assertUnboxed(Class<? extends Enum<?>>... classes) {
+ @SafeVarargs
+ public final EnumUnboxingInspector assertUnboxed(Class<? extends Enum<?>>... classes) {
for (Class<? extends Enum<?>> clazz : classes) {
assertUnboxed(clazz);
}
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/HorizontallyMergedClassesInspector.java b/src/test/java/com/android/tools/r8/utils/codeinspector/HorizontallyMergedClassesInspector.java
index 80e8a5c..1f14df7 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/HorizontallyMergedClassesInspector.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/HorizontallyMergedClassesInspector.java
@@ -22,7 +22,8 @@
}
public HorizontallyMergedClassesInspector assertMerged(Class<?> clazz) {
- assertTrue(horizontallyMergedClasses.hasBeenMerged(toDexType(clazz, dexItemFactory)));
+ assertTrue(
+ horizontallyMergedClasses.hasBeenMergedOrIsMergeTarget(toDexType(clazz, dexItemFactory)));
return this;
}
@@ -32,4 +33,17 @@
}
return this;
}
+
+ public HorizontallyMergedClassesInspector assertMergedIntoDifferentType(Class<?> clazz) {
+ assertTrue(
+ horizontallyMergedClasses.hasBeenMergedIntoDifferentType(toDexType(clazz, dexItemFactory)));
+ return this;
+ }
+
+ public HorizontallyMergedClassesInspector assertMergedIntoDifferentType(Class<?>... classes) {
+ for (Class<?> clazz : classes) {
+ assertMergedIntoDifferentType(clazz);
+ }
+ return this;
+ }
}
