Split the nest test in two and add intermediate variants.
Bug: 145187573
Bug: 145187969
Change-Id: I447dd06deb7f4865b8f6a12396947e2a983f11c2
diff --git a/src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessTest.java
similarity index 79%
copy from src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java
copy to src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessTest.java
index 786177c..63c6161 100644
--- a/src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2019, 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.graph.access;
+package com.android.tools.r8.resolution.access;
import static com.android.tools.r8.TestRuntime.CfVm.JDK11;
import static org.hamcrest.core.StringContains.containsString;
@@ -27,8 +27,9 @@
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
-public class NestMethodAccessTest extends TestBase {
- static final String EXPECTED = StringUtils.lines("A::bar", "A::baz");
+public class NestStaticMethodAccessTest extends TestBase {
+
+ static final String EXPECTED = StringUtils.lines("A::bar");
private final TestParameters parameters;
private final boolean inSameNest;
@@ -44,7 +45,7 @@
BooleanUtils.values());
}
- public NestMethodAccessTest(TestParameters parameters, boolean inSameNest) {
+ public NestStaticMethodAccessTest(TestParameters parameters, boolean inSameNest) {
this.parameters = parameters;
this.inSameNest = inSameNest;
}
@@ -55,10 +56,7 @@
public Collection<byte[]> getTransformedClasses() throws Exception {
return ImmutableList.of(
- withNest(A.class)
- .setPrivate(A.class.getDeclaredMethod("bar"))
- .setPrivate(A.class.getDeclaredMethod("baz"))
- .transform(),
+ withNest(A.class).setPrivate(A.class.getDeclaredMethod("bar")).transform(),
withNest(B.class).transform());
}
@@ -96,17 +94,7 @@
.setMinApi(parameters.getApiLevel())
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
- .disassemble()
- .apply(
- result -> {
- if (parameters.isDexRuntime() && inSameNest) {
- // TODO(b/145187969): R8 incorrectly compiles the nest based access away.
- result.assertFailureWithErrorThatMatches(
- containsString(NullPointerException.class.getName()));
- } else {
- checkExpectedResult(result);
- }
- });
+ .apply(this::checkExpectedResult);
}
private void checkExpectedResult(TestRunResult<?> result) {
@@ -127,21 +115,15 @@
}
static class A {
- /* will be private */ void bar() {
+ /* will be private */ static void bar() {
System.out.println("A::bar");
}
-
- /* will be private */ static void baz() {
- System.out.println("A::baz");
- }
}
static class B {
public void foo() {
- // Virtual invoke to private method.
- new A().bar();
// Static invoke to private method.
- A.baz();
+ A.bar();
}
}
diff --git a/src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessWithIntermediateClassTest.java
similarity index 76%
copy from src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java
copy to src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessWithIntermediateClassTest.java
index 786177c..a487f40 100644
--- a/src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessWithIntermediateClassTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2019, 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.graph.access;
+package com.android.tools.r8.resolution.access;
import static com.android.tools.r8.TestRuntime.CfVm.JDK11;
import static org.hamcrest.core.StringContains.containsString;
@@ -27,8 +27,9 @@
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
-public class NestMethodAccessTest extends TestBase {
- static final String EXPECTED = StringUtils.lines("A::bar", "A::baz");
+public class NestStaticMethodAccessWithIntermediateClassTest extends TestBase {
+
+ static final String EXPECTED = StringUtils.lines("A::bar");
private final TestParameters parameters;
private final boolean inSameNest;
@@ -44,7 +45,8 @@
BooleanUtils.values());
}
- public NestMethodAccessTest(TestParameters parameters, boolean inSameNest) {
+ public NestStaticMethodAccessWithIntermediateClassTest(
+ TestParameters parameters, boolean inSameNest) {
this.parameters = parameters;
this.inSameNest = inSameNest;
}
@@ -55,11 +57,9 @@
public Collection<byte[]> getTransformedClasses() throws Exception {
return ImmutableList.of(
- withNest(A.class)
- .setPrivate(A.class.getDeclaredMethod("bar"))
- .setPrivate(A.class.getDeclaredMethod("baz"))
- .transform(),
- withNest(B.class).transform());
+ withNest(A.class).setPrivate(A.class.getDeclaredMethod("bar")).transform(),
+ withNest(B.class).transform(),
+ withNest(C.class).transform());
}
@Test
@@ -96,13 +96,11 @@
.setMinApi(parameters.getApiLevel())
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
- .disassemble()
.apply(
result -> {
- if (parameters.isDexRuntime() && inSameNest) {
- // TODO(b/145187969): R8 incorrectly compiles the nest based access away.
- result.assertFailureWithErrorThatMatches(
- containsString(NullPointerException.class.getName()));
+ if (inSameNest) {
+ // TODO(b/145187969): R8 incorrectly compiles out the incorrect access.
+ result.assertSuccessWithOutput(EXPECTED);
} else {
checkExpectedResult(result);
}
@@ -110,8 +108,9 @@
}
private void checkExpectedResult(TestRunResult<?> result) {
- if (inSameNest) {
- result.assertSuccessWithOutput(EXPECTED);
+ if (inSameNest && parameters.isCfRuntime()) {
+ // TODO(b/145187969): Investigate if the change to NoSuchMethodError is according to spec?
+ result.assertFailureWithErrorThatMatches(containsString(NoSuchMethodError.class.getName()));
} else {
result.assertFailureWithErrorThatMatches(containsString(IllegalAccessError.class.getName()));
}
@@ -119,35 +118,31 @@
private ClassFileTransformer withNest(Class<?> clazz) throws Exception {
if (inSameNest) {
- // If in the same nest make A host and B a member.
- return transformer(clazz).setNest(A.class, B.class);
+ // If in the same nest make A host with B and C as members.
+ return transformer(clazz).setNest(A.class, B.class, C.class);
}
// Otherwise, set the class to be its own host and no additional members.
return transformer(clazz).setNest(clazz);
}
static class A {
- /* will be private */ void bar() {
+ /* will be private */ static void bar() {
System.out.println("A::bar");
}
-
- /* will be private */ static void baz() {
- System.out.println("A::baz");
- }
}
- static class B {
+ static class B extends A {}
+
+ static class C {
public void foo() {
- // Virtual invoke to private method.
- new A().bar();
// Static invoke to private method.
- A.baz();
+ B.bar();
}
}
static class Main {
public static void main(String[] args) {
- new B().foo();
+ new C().foo();
}
}
}
diff --git a/src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessTest.java
similarity index 90%
rename from src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java
rename to src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessTest.java
index 786177c..59267b2 100644
--- a/src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2019, 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.graph.access;
+package com.android.tools.r8.resolution.access;
import static com.android.tools.r8.TestRuntime.CfVm.JDK11;
import static org.hamcrest.core.StringContains.containsString;
@@ -27,8 +27,9 @@
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
-public class NestMethodAccessTest extends TestBase {
- static final String EXPECTED = StringUtils.lines("A::bar", "A::baz");
+public class NestVirtualMethodAccessTest extends TestBase {
+
+ static final String EXPECTED = StringUtils.lines("A::bar");
private final TestParameters parameters;
private final boolean inSameNest;
@@ -44,7 +45,7 @@
BooleanUtils.values());
}
- public NestMethodAccessTest(TestParameters parameters, boolean inSameNest) {
+ public NestVirtualMethodAccessTest(TestParameters parameters, boolean inSameNest) {
this.parameters = parameters;
this.inSameNest = inSameNest;
}
@@ -57,7 +58,6 @@
return ImmutableList.of(
withNest(A.class)
.setPrivate(A.class.getDeclaredMethod("bar"))
- .setPrivate(A.class.getDeclaredMethod("baz"))
.transform(),
withNest(B.class).transform());
}
@@ -96,7 +96,6 @@
.setMinApi(parameters.getApiLevel())
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
- .disassemble()
.apply(
result -> {
if (parameters.isDexRuntime() && inSameNest) {
@@ -130,18 +129,12 @@
/* will be private */ void bar() {
System.out.println("A::bar");
}
-
- /* will be private */ static void baz() {
- System.out.println("A::baz");
- }
}
static class B {
public void foo() {
// Virtual invoke to private method.
new A().bar();
- // Static invoke to private method.
- A.baz();
}
}
diff --git a/src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessWithIntermediateClassTest.java
similarity index 67%
copy from src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java
copy to src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessWithIntermediateClassTest.java
index 786177c..68cc59e 100644
--- a/src/test/java/com/android/tools/r8/graph/access/NestMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessWithIntermediateClassTest.java
@@ -1,12 +1,15 @@
// Copyright (c) 2019, 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.graph.access;
+package com.android.tools.r8.resolution.access;
import static com.android.tools.r8.TestRuntime.CfVm.JDK11;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRunResult;
@@ -27,8 +30,9 @@
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
-public class NestMethodAccessTest extends TestBase {
- static final String EXPECTED = StringUtils.lines("A::bar", "A::baz");
+public class NestVirtualMethodAccessWithIntermediateClassTest extends TestBase {
+
+ static final String EXPECTED = StringUtils.lines("A::bar");
private final TestParameters parameters;
private final boolean inSameNest;
@@ -44,7 +48,8 @@
BooleanUtils.values());
}
- public NestMethodAccessTest(TestParameters parameters, boolean inSameNest) {
+ public NestVirtualMethodAccessWithIntermediateClassTest(
+ TestParameters parameters, boolean inSameNest) {
this.parameters = parameters;
this.inSameNest = inSameNest;
}
@@ -55,11 +60,9 @@
public Collection<byte[]> getTransformedClasses() throws Exception {
return ImmutableList.of(
- withNest(A.class)
- .setPrivate(A.class.getDeclaredMethod("bar"))
- .setPrivate(A.class.getDeclaredMethod("baz"))
- .transform(),
- withNest(B.class).transform());
+ withNest(A.class).setPrivate(A.class.getDeclaredMethod("bar")).transform(),
+ withNest(B.class).transform(),
+ withNest(C.class).transform());
}
@Test
@@ -90,19 +93,31 @@
@Test
public void testR8() throws Exception {
- testForR8(parameters.getBackend())
- .addProgramClasses(getClasses())
- .addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
- .addKeepMainRule(Main.class)
+ R8FullTestBuilder builder =
+ testForR8(parameters.getBackend())
+ .addProgramClasses(getClasses())
+ .addProgramClassFileData(getTransformedClasses())
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class);
+ // TODO(b/145196085): R8 fails compilation when the classes are in the same nest.
+ if (inSameNest) {
+ if (parameters.isDexRuntime()) {
+ try {
+ builder.compile();
+ } catch (CompilationFailedException e) {
+ // Expected failure.
+ return;
+ }
+ fail("Expected failure: b/145196085");
+ }
+ }
+ builder
.run(parameters.getRuntime(), Main.class)
- .disassemble()
.apply(
result -> {
- if (parameters.isDexRuntime() && inSameNest) {
- // TODO(b/145187969): R8 incorrectly compiles the nest based access away.
- result.assertFailureWithErrorThatMatches(
- containsString(NullPointerException.class.getName()));
+ if (inSameNest) {
+ // TODO(b/145187969): R8 compiles out the errors when in the same nest.
+ result.assertSuccessWithOutput(EXPECTED);
} else {
checkExpectedResult(result);
}
@@ -110,8 +125,9 @@
}
private void checkExpectedResult(TestRunResult<?> result) {
- if (inSameNest) {
- result.assertSuccessWithOutput(EXPECTED);
+ if (inSameNest && parameters.isCfRuntime()) {
+ // TODO(b/145187969): Investigate if the change to NoSuchMethodError is according to spec?
+ result.assertFailureWithErrorThatMatches(containsString(NoSuchMethodError.class.getName()));
} else {
result.assertFailureWithErrorThatMatches(containsString(IllegalAccessError.class.getName()));
}
@@ -119,8 +135,8 @@
private ClassFileTransformer withNest(Class<?> clazz) throws Exception {
if (inSameNest) {
- // If in the same nest make A host and B a member.
- return transformer(clazz).setNest(A.class, B.class);
+ // If in the same nest make A host with B and C as members.
+ return transformer(clazz).setNest(A.class, B.class, C.class);
}
// Otherwise, set the class to be its own host and no additional members.
return transformer(clazz).setNest(clazz);
@@ -130,24 +146,20 @@
/* will be private */ void bar() {
System.out.println("A::bar");
}
-
- /* will be private */ static void baz() {
- System.out.println("A::baz");
- }
}
- static class B {
+ static class B extends A {}
+
+ static class C {
public void foo() {
// Virtual invoke to private method.
- new A().bar();
- // Static invoke to private method.
- A.baz();
+ new B().bar();
}
}
static class Main {
public static void main(String[] args) {
- new B().foo();
+ new C().foo();
}
}
}
