Rewrite invokevirtual and invokeinterface for nest access when emitting DEX
Bug: b/236125275
Change-Id: I2be1e6bbb1808621948442fb4ae2e03432720168
diff --git a/src/main/java/com/android/tools/r8/graph/DexClass.java b/src/main/java/com/android/tools/r8/graph/DexClass.java
index 0564b9c..85f928d 100644
--- a/src/main/java/com/android/tools/r8/graph/DexClass.java
+++ b/src/main/java/com/android/tools/r8/graph/DexClass.java
@@ -1189,6 +1189,10 @@
return null;
}
+ public boolean isInSameNest(DexClass other) {
+ return isInANest() && other.isInANest() && getNestHost() == other.getNestHost();
+ }
+
public void forEachNestMember(Consumer<DexType> consumer) {
assert isNestHost();
getNestMembersClassAttributes().forEach(member -> consumer.accept(member.getNestMember()));
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeInterface.java b/src/main/java/com/android/tools/r8/ir/code/InvokeInterface.java
index 43ec7af..0f0deab 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeInterface.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeInterface.java
@@ -68,7 +68,7 @@
if (needsRangedInvoke(builder)) {
assert argumentsConsecutive(builder);
int firstRegister = argumentRegisterValue(0, builder);
- if (isPrivateMethodInvokedOnSelf(builder)) {
+ if (isPrivateMethodInvokedOnSelf(builder) || isPrivateNestMethodInvoke(builder)) {
instruction =
new DexInvokeDirectRange(firstRegister, argumentRegisters, getInvokedMethod());
} else {
@@ -78,7 +78,7 @@
} else {
int[] individualArgumentRegisters = new int[5];
int argumentRegistersCount = fillArgumentRegisters(builder, individualArgumentRegisters);
- if (isPrivateMethodInvokedOnSelf(builder)) {
+ if (isPrivateMethodInvokedOnSelf(builder) || isPrivateNestMethodInvoke(builder)) {
instruction =
new DexInvokeDirect(
argumentRegistersCount,
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeMethodWithReceiver.java b/src/main/java/com/android/tools/r8/ir/code/InvokeMethodWithReceiver.java
index ead2849..a0c67d5 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeMethodWithReceiver.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeMethodWithReceiver.java
@@ -110,6 +110,26 @@
return false;
}
+ protected boolean isPrivateNestMethodInvoke(DexBuilder builder) {
+ if (!builder.getOptions().emitNestAnnotationsInDex) {
+ return false;
+ }
+ DexProgramClass holder = builder.getProgramMethod().getHolder();
+ if (!holder.isInANest()) {
+ return false;
+ }
+ DexClassAndMethod target = builder.appView.appInfo().definitionFor(getInvokedMethod());
+ // Nest completeness for input is checked before starting to write DEX, so if target is null
+ // it is not in a nest with the holder of the method with this invoke.
+ if (target == null || target.getHolder().isLibraryClass()) {
+ return false;
+ }
+ if (!target.getAccessFlags().isPrivate()) {
+ return false;
+ }
+ return holder.isInSameNest(target.getHolder());
+ }
+
@Override
public boolean throwsNpeIfValueIsNull(Value value, AppView<?> appView, ProgramMethod context) {
return value == getReceiver() || super.throwsNpeIfValueIsNull(value, appView, context);
diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java b/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
index bfcb485..5809552 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
@@ -74,7 +74,7 @@
if (needsRangedInvoke(builder)) {
assert argumentsConsecutive(builder);
int firstRegister = argumentRegisterValue(0, builder);
- if (isPrivateMethodInvokedOnSelf(builder)) {
+ if (isPrivateMethodInvokedOnSelf(builder) || isPrivateNestMethodInvoke(builder)) {
instruction =
new DexInvokeDirectRange(firstRegister, argumentRegisters, getInvokedMethod());
} else {
@@ -84,7 +84,7 @@
} else {
int[] individualArgumentRegisters = new int[5];
int argumentRegistersCount = fillArgumentRegisters(builder, individualArgumentRegisters);
- if (isPrivateMethodInvokedOnSelf(builder)) {
+ if (isPrivateMethodInvokedOnSelf(builder) || isPrivateNestMethodInvoke(builder)) {
instruction =
new DexInvokeDirect(
argumentRegistersCount,
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
index ec93ef2..85bc79c 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
@@ -36,6 +36,7 @@
import com.android.tools.r8.dex.code.DexNop;
import com.android.tools.r8.dex.code.DexThrow;
import com.android.tools.r8.errors.Unreachable;
+import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DebugLocalInfo;
import com.android.tools.r8.graph.DexCode;
import com.android.tools.r8.graph.DexCode.Try;
@@ -43,6 +44,7 @@
import com.android.tools.r8.graph.DexCode.TryHandler.TypeAddrPair;
import com.android.tools.r8.graph.DexDebugEventBuilder;
import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata;
import com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider;
import com.android.tools.r8.ir.analysis.type.TypeElement;
@@ -84,6 +86,8 @@
*/
public class DexBuilder {
+ public final AppView<?> appView;
+
// The IR representation of the code to build.
private final IRCode ir;
@@ -128,20 +132,29 @@
BasicBlock nextBlock;
public DexBuilder(
+ AppView<?> appView,
IRCode ir,
BytecodeMetadataProvider bytecodeMetadataProvider,
RegisterAllocator registerAllocator,
InternalOptions options) {
- this(ir, bytecodeMetadataProvider, registerAllocator, options, ir.getConversionOptions());
+ this(
+ appView,
+ ir,
+ bytecodeMetadataProvider,
+ registerAllocator,
+ options,
+ ir.getConversionOptions());
}
public DexBuilder(
+ AppView<?> appView,
IRCode ir,
BytecodeMetadataProvider bytecodeMetadataProvider,
RegisterAllocator registerAllocator,
InternalOptions options,
MethodConversionOptions conversionOptions) {
assert ir == null || conversionOptions == ir.getConversionOptions();
+ this.appView = appView;
this.ir = ir;
this.bytecodeMetadataBuilder = BytecodeMetadata.builder(bytecodeMetadataProvider);
this.registerAllocator = registerAllocator;
@@ -160,6 +173,7 @@
DexBuilder builder =
new DexBuilder(
null,
+ null,
BytecodeMetadataProvider.empty(),
allocator,
allocator.options(),
@@ -960,6 +974,10 @@
return registerAllocator;
}
+ public ProgramMethod getProgramMethod() {
+ return registerAllocator.getProgramMethod();
+ }
+
// Dex instruction wrapper with information to compute instruction sizes and offsets for jumps.
private static abstract class Info {
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java b/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
index 4155003..cbd0d06 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
@@ -9,6 +9,7 @@
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider;
import com.android.tools.r8.ir.code.IRCode;
+import com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring;
import com.android.tools.r8.ir.optimize.CodeRewriter;
import com.android.tools.r8.ir.optimize.DeadCodeRemover;
import com.android.tools.r8.ir.optimize.PeepholeOptimizer;
@@ -35,6 +36,9 @@
@Override
public DexCode finalizeCode(
IRCode code, BytecodeMetadataProvider bytecodeMetadataProvider, Timing timing) {
+ if (options.emitNestAnnotationsInDex) {
+ D8NestBasedAccessDesugaring.checkAndFailOnIncompleteNests(appView);
+ }
DexEncodedMethod method = code.method();
code.traceBlocks();
RuntimeWorkaroundCodeRewriter.workaroundNumberConversionRegisterAllocationBug(code, options);
@@ -47,7 +51,8 @@
RuntimeWorkaroundCodeRewriter.workaroundExceptionTargetingLoopHeaderBug(code, options);
// Perform register allocation.
RegisterAllocator registerAllocator = performRegisterAllocation(code, method, timing);
- return new DexBuilder(code, bytecodeMetadataProvider, registerAllocator, options).build();
+ return new DexBuilder(appView, code, bytecodeMetadataProvider, registerAllocator, options)
+ .build();
}
private RegisterAllocator performRegisterAllocation(
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/nest/D8NestBasedAccessDesugaring.java b/src/main/java/com/android/tools/r8/ir/desugar/nest/D8NestBasedAccessDesugaring.java
index ee5b716..bde95b8 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/nest/D8NestBasedAccessDesugaring.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/nest/D8NestBasedAccessDesugaring.java
@@ -55,6 +55,19 @@
});
}
+ public static void checkAndFailOnIncompleteNests(AppView<?> appView) {
+ forEachNest(
+ nest -> {
+ if (nest.hasMissingMembers()) {
+ throw appView.options().errorMissingNestMember(nest);
+ }
+ },
+ classWithoutHost -> {
+ throw appView.options().errorMissingNestHost(classWithoutHost);
+ },
+ appView);
+ }
+
public void clearNestAttributes() {
forEachNest(
nest -> {
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/nest/NestBasedAccessDesugaring.java b/src/main/java/com/android/tools/r8/ir/desugar/nest/NestBasedAccessDesugaring.java
index 37451f0..1b3e48e 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/nest/NestBasedAccessDesugaring.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/nest/NestBasedAccessDesugaring.java
@@ -102,6 +102,21 @@
}
}
+ static void forEachNest(
+ Consumer<Nest> consumer, Consumer<DexClass> missingHostConsumer, AppView<?> appView) {
+ Set<DexType> seenNestHosts = Sets.newIdentityHashSet();
+ for (DexProgramClass clazz : appView.appInfo().classes()) {
+ if (!clazz.isInANest() || !seenNestHosts.add(clazz.getNestHost())) {
+ continue;
+ }
+
+ Nest nest = Nest.create(appView, clazz, missingHostConsumer);
+ if (nest != null) {
+ consumer.accept(nest);
+ }
+ }
+ }
+
private static class BridgeAndTarget<T extends DexClassAndMember<?, ?>> {
private final DexMethod bridge;
private final T target;
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java
new file mode 100644
index 0000000..b3d4ca5
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java
@@ -0,0 +1,544 @@
+// Copyright (c) 2022, 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.desugar.nestaccesscontrol;
+
+import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestRuntime.CfVm;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.android.tools.r8.utils.codeinspector.InstructionSubject;
+import com.android.tools.r8.utils.codeinspector.MethodSubject;
+import com.google.common.collect.ImmutableList;
+import java.nio.file.Path;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+@RunWith(Parameterized.class)
+public class NestAttributesInDexRewriteInvokeInterfaceTest extends TestBase implements Opcodes {
+
+ @Parameter(0)
+ public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ getTestParameters()
+ .withDexRuntimesStartingFromIncluding(Version.V7_0_0)
+ .withCfRuntimesStartingFromIncluding(CfVm.JDK11)
+ .withApiLevelsStartingAtIncluding(AndroidApiLevel.N)
+ .build());
+ }
+
+ private static final List<String> EXPECTED_OUTPUT_LINES = ImmutableList.of("Hello, world!");
+
+ @Test
+ public void testRuntime() throws Exception {
+ assumeTrue(parameters.isCfRuntime());
+ testForJvm()
+ .addProgramClassFileData(
+ dumpHost(),
+ dumpMember1(),
+ dumpMember2(),
+ dumpHostImpl(),
+ dumpMember1Impl(),
+ dumpMember2Impl())
+ .run(parameters.getRuntime(), "HostImpl")
+ .assertSuccessWithOutputLines(EXPECTED_OUTPUT_LINES);
+ }
+
+ private int nonConstructorInvokeDirectCount(MethodSubject method) {
+ return (int)
+ method
+ .streamInstructions()
+ .filter(InstructionSubject::isInvokeSpecialOrDirect)
+ .filter(instruction -> !instruction.getMethod().getName().toString().equals("<init>"))
+ .count();
+ }
+
+ @Test
+ public void testD8() throws Exception {
+ assumeTrue(parameters.isDexRuntime());
+ // TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
+ assertFalse(parameters.getApiLevel().getLevel() > 33);
+ testForD8()
+ .addProgramClassFileData(
+ dumpHost(),
+ dumpMember1(),
+ dumpMember2(),
+ dumpHostImpl(),
+ dumpMember1Impl(),
+ dumpMember2Impl())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 2,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("h1")));
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member1").uniqueMethodWithName("m")));
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member2").uniqueMethodWithName("m")));
+ })
+ .run(parameters.getRuntime(), "HostImpl")
+ .assertFailureWithErrorThatThrows(IllegalAccessError.class);
+ }
+
+ @Test
+ public void testD8WithClasspathAndMerge() throws Exception {
+ assumeTrue(parameters.isDexRuntime());
+ // TODO(sgjesse): Update test when a DEX VM natively supporting nests is added.
+ assertFalse(parameters.getApiLevel().getLevel() > 33);
+
+ Path host =
+ testForD8()
+ .addProgramClassFileData(dumpHost())
+ .addClasspathClassFileData(dumpMember1(), dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 2,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("h1")));
+ })
+ .writeToZip();
+
+ Path member1 =
+ testForD8()
+ .addProgramClassFileData(dumpMember1())
+ .addClasspathClassFileData(dumpHost(), dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member1").uniqueMethodWithName("m")));
+ })
+ .writeToZip();
+
+ Path member2 =
+ testForD8()
+ .addProgramClassFileData(dumpMember2())
+ .addClasspathClassFileData(dumpHost(), dumpMember1())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member2").uniqueMethodWithName("m")));
+ })
+ .writeToZip();
+
+ Path impls =
+ testForD8()
+ .addProgramClassFileData(dumpHostImpl(), dumpMember1Impl(), dumpMember2Impl())
+ .addClasspathClassFileData(dumpHost(), dumpMember1(), dumpMember2Impl())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .writeToZip();
+
+ testForD8()
+ .addProgramFiles(host, member1, member2, impls)
+ .addClasspathClassFileData(dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 2,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("h1")));
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member1").uniqueMethodWithName("m")));
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member2").uniqueMethodWithName("m")));
+ })
+ .run(parameters.getRuntime(), "HostImpl")
+ .assertFailureWithErrorThatThrows(IllegalAccessError.class);
+ }
+
+ @Test
+ public void testD8WithoutMembersOnClasspath() {
+ assumeTrue(parameters.isDexRuntime());
+ // TODO(sgjesse): Update test when a DEX VM natively supporting nests is added.
+ assertFalse(parameters.getApiLevel().getLevel() > 33);
+
+ assertThrows(
+ CompilationFailedException.class,
+ () ->
+ testForD8()
+ .addProgramClassFileData(dumpHost())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compileWithExpectedDiagnostics(
+ diagnostics -> {
+ diagnostics.assertOnlyErrors();
+ diagnostics.assertErrorThatMatches(
+ (diagnosticMessage(containsString("Host requires its nest mates"))));
+ }));
+ }
+
+ @Test
+ public void testD8WithoutHostOnClasspath() {
+ assumeTrue(parameters.isDexRuntime());
+ // TODO(sgjesse): Update test when a DEX VM natively supporting nests is added.
+ assertFalse(parameters.getApiLevel().getLevel() > 33);
+
+ assertThrows(
+ CompilationFailedException.class,
+ () ->
+ testForD8()
+ .addProgramClassFileData(dumpMember1(), dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compileWithExpectedDiagnostics(
+ diagnostics -> {
+ diagnostics.assertOnlyErrors();
+ diagnostics.assertErrorThatMatches(
+ (diagnosticMessage(containsString("requires its nest host Host"))));
+ }));
+ }
+
+ /*
+ Dump of:
+
+ interface Host {
+
+ interface Member1 {
+ private void m(Host host) {
+ host.h2("Hello");
+ }
+ }
+
+ interface Member2 {
+ private void m(Host host) {
+ host.h2(", world!");
+ }
+ }
+
+ default void h1(Member1 m1, Member2 m2) {
+ m1.m(this);
+ m2.m(this);
+ }
+
+ private void h2(String message) {
+ System.out.print(message);
+ }
+ }
+
+ class HostImpl implements Host {
+ public static void main(String[] args) {
+ Host host = new HostImpl();
+ Host.Member1 member1 = new Member1Impl();
+ Host.Member2 member2 = new Member2Impl();
+ host.h1(member1, member2);
+ System.out.println();
+ }
+ }
+
+ class Member1Impl implements Host.Member1 {}
+
+ class Member2Impl implements Host.Member2 {}
+
+ */
+
+ public static byte[] dumpHost() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(V11, ACC_ABSTRACT | ACC_INTERFACE, "Host", null, "java/lang/Object", null);
+ classWriter.visitSource("Host.java", null);
+ classWriter.visitNestMember("Host$Member2");
+ classWriter.visitNestMember("Host$Member1");
+ classWriter.visitInnerClass(
+ "Host$Member2", "Host", "Member2", ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE);
+ classWriter.visitInnerClass(
+ "Host$Member1", "Host", "Member1", ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE);
+
+ {
+ methodVisitor =
+ classWriter.visitMethod(ACC_PUBLIC, "h1", "(LHost$Member1;LHost$Member2;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(16, label0);
+ methodVisitor.visitVarInsn(ALOAD, 1);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKEINTERFACE, "Host$Member1", "m", "(LHost;)V", true);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(17, label1);
+ methodVisitor.visitVarInsn(ALOAD, 2);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKEINTERFACE, "Host$Member2", "m", "(LHost;)V", true);
+ Label label2 = new Label();
+ methodVisitor.visitLabel(label2);
+ methodVisitor.visitLineNumber(18, label2);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 3);
+ methodVisitor.visitEnd();
+ }
+ {
+ methodVisitor =
+ classWriter.visitMethod(ACC_PRIVATE, "h2", "(Ljava/lang/String;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(21, label0);
+ methodVisitor.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+ methodVisitor.visitVarInsn(ALOAD, 1);
+ methodVisitor.visitMethodInsn(
+ INVOKEVIRTUAL, "java/io/PrintStream", "print", "(Ljava/lang/String;)V", false);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(22, label1);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 2);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+ return classWriter.toByteArray();
+ }
+
+ public static byte[] dumpMember1() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(
+ V11,
+ ACC_PUBLIC | ACC_ABSTRACT | ACC_INTERFACE,
+ "Host$Member1",
+ null,
+ "java/lang/Object",
+ null);
+ classWriter.visitSource("Host.java", null);
+ classWriter.visitNestHost("Host");
+ classWriter.visitInnerClass(
+ "Host$Member1", "Host", "Member1", ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE);
+ {
+ methodVisitor = classWriter.visitMethod(ACC_PRIVATE, "m", "(LHost;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(5, label0);
+ methodVisitor.visitVarInsn(ALOAD, 1);
+ methodVisitor.visitLdcInsn("Hello");
+ methodVisitor.visitMethodInsn(INVOKEINTERFACE, "Host", "h2", "(Ljava/lang/String;)V", true);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(6, label1);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 2);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+
+ public static byte[] dumpMember2() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(
+ V11,
+ ACC_PUBLIC | ACC_ABSTRACT | ACC_INTERFACE,
+ "Host$Member2",
+ null,
+ "java/lang/Object",
+ null);
+ classWriter.visitSource("Host.java", null);
+ classWriter.visitNestHost("Host");
+ classWriter.visitInnerClass(
+ "Host$Member2", "Host", "Member2", ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE);
+ {
+ methodVisitor = classWriter.visitMethod(ACC_PRIVATE, "m", "(LHost;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(11, label0);
+ methodVisitor.visitVarInsn(ALOAD, 1);
+ methodVisitor.visitLdcInsn(", world!");
+ methodVisitor.visitMethodInsn(INVOKEINTERFACE, "Host", "h2", "(Ljava/lang/String;)V", true);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(12, label1);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 2);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+
+ public static byte[] dumpHostImpl() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(V11, ACC_SUPER, "HostImpl", null, "java/lang/Object", new String[] {"Host"});
+ classWriter.visitSource("HostImpl.java", null);
+ classWriter.visitInnerClass(
+ "Host$Member1", "Host", "Member1", ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE);
+ classWriter.visitInnerClass(
+ "Host$Member2", "Host", "Member2", ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE);
+ {
+ methodVisitor = classWriter.visitMethod(0, "<init>", "()V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(1, label0);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(1, 1);
+ methodVisitor.visitEnd();
+ }
+ {
+ methodVisitor =
+ classWriter.visitMethod(
+ ACC_PUBLIC | ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(3, label0);
+ methodVisitor.visitTypeInsn(NEW, "HostImpl");
+ methodVisitor.visitInsn(DUP);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "HostImpl", "<init>", "()V", false);
+ methodVisitor.visitVarInsn(ASTORE, 1);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(4, label1);
+ methodVisitor.visitTypeInsn(NEW, "Member1Impl");
+ methodVisitor.visitInsn(DUP);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "Member1Impl", "<init>", "()V", false);
+ methodVisitor.visitVarInsn(ASTORE, 2);
+ Label label2 = new Label();
+ methodVisitor.visitLabel(label2);
+ methodVisitor.visitLineNumber(5, label2);
+ methodVisitor.visitTypeInsn(NEW, "Member2Impl");
+ methodVisitor.visitInsn(DUP);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "Member2Impl", "<init>", "()V", false);
+ methodVisitor.visitVarInsn(ASTORE, 3);
+ Label label3 = new Label();
+ methodVisitor.visitLabel(label3);
+ methodVisitor.visitLineNumber(6, label3);
+ methodVisitor.visitVarInsn(ALOAD, 1);
+ methodVisitor.visitVarInsn(ALOAD, 2);
+ methodVisitor.visitVarInsn(ALOAD, 3);
+ methodVisitor.visitMethodInsn(
+ INVOKEINTERFACE, "Host", "h1", "(LHost$Member1;LHost$Member2;)V", true);
+ Label label4 = new Label();
+ methodVisitor.visitLabel(label4);
+ methodVisitor.visitLineNumber(7, label4);
+ methodVisitor.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+ methodVisitor.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "()V", false);
+ Label label5 = new Label();
+ methodVisitor.visitLabel(label5);
+ methodVisitor.visitLineNumber(8, label5);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(3, 4);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+
+ public static byte[] dumpMember1Impl() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(
+ V11, ACC_SUPER, "Member1Impl", null, "java/lang/Object", new String[] {"Host$Member1"});
+ classWriter.visitSource("Member1Impl.java", null);
+ classWriter.visitInnerClass(
+ "Host$Member1", "Host", "Member1", ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE);
+ {
+ methodVisitor = classWriter.visitMethod(0, "<init>", "()V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(1, label0);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(1, 1);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+
+ public static byte[] dumpMember2Impl() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(
+ V11, ACC_SUPER, "Member2Impl", null, "java/lang/Object", new String[] {"Host$Member2"});
+ classWriter.visitSource("Member2Impl.java", null);
+ classWriter.visitInnerClass(
+ "Host$Member2", "Host", "Member2", ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE);
+ {
+ methodVisitor = classWriter.visitMethod(0, "<init>", "()V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(1, label0);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(1, 1);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java
new file mode 100644
index 0000000..4d47a29
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java
@@ -0,0 +1,438 @@
+// Copyright (c) 2022, 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.desugar.nestaccesscontrol;
+
+import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestRuntime.CfVm;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.android.tools.r8.utils.codeinspector.InstructionSubject;
+import com.android.tools.r8.utils.codeinspector.MethodSubject;
+import com.google.common.collect.ImmutableList;
+import java.nio.file.Path;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+@RunWith(Parameterized.class)
+public class NestAttributesInDexRewriteInvokeVirtualTest extends TestBase implements Opcodes {
+
+ @Parameter(0)
+ public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build());
+ }
+
+ private static final List<String> EXPECTED_OUTPUT_LINES = ImmutableList.of("Hello, world!");
+
+ @Test
+ public void testRuntime() throws Exception {
+ assumeTrue(
+ parameters.isCfRuntime()
+ && parameters.asCfRuntime().isNewerThanOrEqual(CfVm.JDK11)
+ && parameters.getApiLevel().isEqualTo(AndroidApiLevel.B));
+ testForJvm()
+ .addProgramClassFileData(dumpHost(), dumpMember1(), dumpMember2())
+ .run(parameters.getRuntime(), "Host")
+ .assertSuccessWithOutputLines(EXPECTED_OUTPUT_LINES);
+ }
+
+ private int nonConstructorInvokeDirectCount(MethodSubject method) {
+ return (int)
+ method
+ .streamInstructions()
+ .filter(InstructionSubject::isInvokeSpecialOrDirect)
+ .filter(instruction -> !instruction.getMethod().getName().toString().equals("<init>"))
+ .count();
+ }
+
+ @Test
+ public void testD8() throws Exception {
+ assumeTrue(parameters.isDexRuntime());
+ // TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
+ assertFalse(parameters.getApiLevel().getLevel() > 33);
+ testForD8()
+ .addProgramClassFileData(dumpHost(), dumpMember1(), dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("main")));
+ assertEquals(
+ 2,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("h1")));
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member1").uniqueMethodWithName("m")));
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member2").uniqueMethodWithName("m")));
+ })
+ .run(parameters.getRuntime(), "Host")
+ .assertFailureWithErrorThatThrows(IllegalAccessError.class);
+ }
+
+ @Test
+ public void testD8WithClasspathAndMerge() throws Exception {
+ assumeTrue(parameters.isDexRuntime());
+ // TODO(sgjesse): Update test when a DEX VM natively supporting nests is added.
+ assertFalse(parameters.getApiLevel().getLevel() > 33);
+
+ Path host =
+ testForD8()
+ .addProgramClassFileData(dumpHost())
+ .addClasspathClassFileData(dumpMember1(), dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("main")));
+ assertEquals(
+ 2,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("h1")));
+ })
+ .writeToZip();
+
+ Path member1 =
+ testForD8()
+ .addProgramClassFileData(dumpMember1())
+ .addClasspathClassFileData(dumpHost(), dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member1").uniqueMethodWithName("m")));
+ })
+ .writeToZip();
+
+ Path member2 =
+ testForD8()
+ .addProgramClassFileData(dumpMember2())
+ .addClasspathClassFileData(dumpHost(), dumpMember1())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member2").uniqueMethodWithName("m")));
+ })
+ .writeToZip();
+
+ testForD8()
+ .addProgramFiles(host, member1, member2)
+ .addClasspathClassFileData(dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compile()
+ .inspect(
+ inspector -> {
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("main")));
+ assertEquals(
+ 2,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host").uniqueMethodWithName("h1")));
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member1").uniqueMethodWithName("m")));
+ assertEquals(
+ 1,
+ nonConstructorInvokeDirectCount(
+ inspector.clazz("Host$Member2").uniqueMethodWithName("m")));
+ })
+ .run(parameters.getRuntime(), "Host")
+ .assertFailureWithErrorThatThrows(IllegalAccessError.class);
+ }
+
+ @Test
+ public void testD8WithoutMembersOnClasspath() {
+ assumeTrue(parameters.isDexRuntime());
+ // TODO(sgjesse): Update test when a DEX VM natively supporting nests is added.
+ assertFalse(parameters.getApiLevel().getLevel() > 33);
+
+ assertThrows(
+ CompilationFailedException.class,
+ () ->
+ testForD8()
+ .addProgramClassFileData(dumpHost())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compileWithExpectedDiagnostics(
+ diagnostics -> {
+ diagnostics.assertOnlyErrors();
+ diagnostics.assertErrorThatMatches(
+ (diagnosticMessage(containsString("Host requires its nest mates"))));
+ }));
+ }
+
+ @Test
+ public void testD8WithoutHostOnClasspath() {
+ assumeTrue(parameters.isDexRuntime());
+ // TODO(sgjesse): Update test when a DEX VM natively supporting nests is added.
+ assertFalse(parameters.getApiLevel().getLevel() > 33);
+
+ assertThrows(
+ CompilationFailedException.class,
+ () ->
+ testForD8()
+ .addProgramClassFileData(dumpMember1(), dumpMember2())
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
+ .compileWithExpectedDiagnostics(
+ diagnostics -> {
+ diagnostics.assertOnlyErrors();
+ diagnostics.assertErrorThatMatches(
+ (diagnosticMessage(containsString("requires its nest host Host"))));
+ }));
+ }
+
+ /*
+ Dump of:
+
+ public class Host {
+ public static void main(String[] args) {
+ new Host().h1();
+ System.out.println();
+ }
+
+ static class Member1 {
+ private void m(Host host) {
+ host.h2("Hello");
+ }
+ }
+
+ static class Member2 {
+ private void m(Host host) {
+ host.h2(", world!");
+ }
+ }
+
+ private void h1() {
+ new Member1().m(this);
+ new Member2().m(this);
+ }
+
+ private void h2(String message) {
+ System.out.print(message);
+ }
+ }
+ */
+
+ public static byte[] dumpHost() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(V11, ACC_PUBLIC | ACC_SUPER, "Host", null, "java/lang/Object", null);
+ classWriter.visitSource("Host.java", null);
+ classWriter.visitNestMember("Host$Member2");
+ classWriter.visitNestMember("Host$Member1");
+ classWriter.visitInnerClass("Host$Member2", "Host", "Member2", ACC_STATIC);
+ classWriter.visitInnerClass("Host$Member1", "Host", "Member1", ACC_STATIC);
+ {
+ methodVisitor = classWriter.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(1, label0);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(1, 1);
+ methodVisitor.visitEnd();
+ }
+ {
+ methodVisitor =
+ classWriter.visitMethod(
+ ACC_PUBLIC | ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(3, label0);
+ methodVisitor.visitTypeInsn(NEW, "Host");
+ methodVisitor.visitInsn(DUP);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "Host", "<init>", "()V", false);
+ methodVisitor.visitMethodInsn(INVOKEVIRTUAL, "Host", "h1", "()V", false);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(4, label1);
+ methodVisitor.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+ methodVisitor.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "()V", false);
+ Label label2 = new Label();
+ methodVisitor.visitLabel(label2);
+ methodVisitor.visitLineNumber(5, label2);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 1);
+ methodVisitor.visitEnd();
+ }
+ {
+ methodVisitor = classWriter.visitMethod(ACC_PRIVATE, "h1", "()V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(18, label0);
+ methodVisitor.visitTypeInsn(NEW, "Host$Member1");
+ methodVisitor.visitInsn(DUP);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "Host$Member1", "<init>", "()V", false);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKEVIRTUAL, "Host$Member1", "m", "(LHost;)V", false);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(19, label1);
+ methodVisitor.visitTypeInsn(NEW, "Host$Member2");
+ methodVisitor.visitInsn(DUP);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "Host$Member2", "<init>", "()V", false);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKEVIRTUAL, "Host$Member2", "m", "(LHost;)V", false);
+ Label label2 = new Label();
+ methodVisitor.visitLabel(label2);
+ methodVisitor.visitLineNumber(20, label2);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 1);
+ methodVisitor.visitEnd();
+ }
+ {
+ methodVisitor =
+ classWriter.visitMethod(ACC_PRIVATE, "h2", "(Ljava/lang/String;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(23, label0);
+ methodVisitor.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+ methodVisitor.visitVarInsn(ALOAD, 1);
+ methodVisitor.visitMethodInsn(
+ INVOKEVIRTUAL, "java/io/PrintStream", "print", "(Ljava/lang/String;)V", false);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(24, label1);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 2);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+
+ public static byte[] dumpMember1() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(V11, ACC_SUPER, "Host$Member1", null, "java/lang/Object", null);
+ classWriter.visitSource("Host.java", null);
+ classWriter.visitNestHost("Host");
+ classWriter.visitInnerClass("Host$Member1", "Host", "Member1", ACC_STATIC);
+ {
+ methodVisitor = classWriter.visitMethod(0, "<init>", "()V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(7, label0);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(1, 1);
+ methodVisitor.visitEnd();
+ }
+ {
+ methodVisitor = classWriter.visitMethod(ACC_PRIVATE, "m", "(LHost;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(9, label0);
+ methodVisitor.visitVarInsn(ALOAD, 1);
+ methodVisitor.visitLdcInsn("Hello");
+ methodVisitor.visitMethodInsn(INVOKEVIRTUAL, "Host", "h2", "(Ljava/lang/String;)V", false);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(10, label1);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 2);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+
+ public static byte[] dumpMember2() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ MethodVisitor methodVisitor;
+
+ classWriter.visit(V11, ACC_SUPER, "Host$Member2", null, "java/lang/Object", null);
+ classWriter.visitSource("Host.java", null);
+ classWriter.visitNestHost("Host");
+ classWriter.visitInnerClass("Host$Member2", "Host", "Member2", ACC_STATIC);
+ {
+ methodVisitor = classWriter.visitMethod(0, "<init>", "()V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(13, label0);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(1, 1);
+ methodVisitor.visitEnd();
+ }
+ {
+ methodVisitor = classWriter.visitMethod(ACC_PRIVATE, "m", "(LHost;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(14, label0);
+ methodVisitor.visitVarInsn(ALOAD, 1);
+ methodVisitor.visitLdcInsn(", world!");
+ methodVisitor.visitMethodInsn(INVOKEVIRTUAL, "Host", "h2", "(Ljava/lang/String;)V", false);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 2);
+ methodVisitor.visitEnd();
+ }
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+}
