Allow a program definition to shadow global synthetics.
Bug: b/241347641
Change-Id: I7433c6d6838e731c9872926da76269e4357c2a67
diff --git a/src/main/java/com/android/tools/r8/utils/InternalGlobalSyntheticsProgramProvider.java b/src/main/java/com/android/tools/r8/utils/InternalGlobalSyntheticsProgramProvider.java
index 6b2d828..ce90ced 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalGlobalSyntheticsProgramProvider.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalGlobalSyntheticsProgramProvider.java
@@ -9,7 +9,7 @@
import com.android.tools.r8.ProgramResourceProvider;
import com.android.tools.r8.ResourceException;
import com.android.tools.r8.Version;
-import com.android.tools.r8.origin.ArchiveEntryOrigin;
+import com.android.tools.r8.origin.Origin;
import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -25,6 +25,21 @@
public class InternalGlobalSyntheticsProgramProvider implements ProgramResourceProvider {
+ public class GlobalsEntryOrigin extends Origin {
+
+ private final String entryName;
+
+ public GlobalsEntryOrigin(String entryName, Origin parent) {
+ super(parent);
+ this.entryName = entryName;
+ }
+
+ @Override
+ public String part() {
+ return "global(" + entryName + ")";
+ }
+ }
+
private final List<GlobalSyntheticsResourceProvider> providers;
private List<ProgramResource> resources = null;
@@ -69,7 +84,7 @@
+ Version.getVersionString());
}
} else if (name.endsWith(FileUtils.GLOBAL_SYNTHETIC_EXTENSION) && seen.add(name)) {
- ArchiveEntryOrigin origin = new ArchiveEntryOrigin(name, provider.getOrigin());
+ GlobalsEntryOrigin origin = new GlobalsEntryOrigin(name, provider.getOrigin());
String descriptor = guessTypeDescriptor(name);
byte[] bytes = ByteStreams.toByteArray(stream);
Set<String> descriptors = Collections.singleton(descriptor);
diff --git a/src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java b/src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
index a5bbfcb..920b83c 100644
--- a/src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
+++ b/src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
@@ -9,6 +9,7 @@
import com.android.tools.r8.graph.DexProgramClass;
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.references.Reference;
+import com.android.tools.r8.utils.InternalGlobalSyntheticsProgramProvider.GlobalsEntryOrigin;
import com.google.common.collect.ImmutableList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -60,13 +61,7 @@
public static ProgramClassConflictResolver defaultConflictResolver(Reporter reporter) {
// The default conflict resolver only merges synthetic classes generated by D8 correctly.
// All other conflicts are reported as a fatal error.
- return (DexProgramClass a, DexProgramClass b) -> {
- assert a.type == b.type;
- if (a.accessFlags.isSynthetic() && b.accessFlags.isSynthetic()) {
- return mergeClasses(reporter, a, b);
- }
- throw reportDuplicateTypes(reporter, a, b);
- };
+ return (DexProgramClass a, DexProgramClass b) -> mergeClasses(reporter, a, b);
}
private static RuntimeException reportDuplicateTypes(
@@ -79,6 +74,31 @@
private static DexProgramClass mergeClasses(
Reporter reporter, DexProgramClass a, DexProgramClass b) {
+ assert a.type == b.type;
+ boolean syntheticA = a.accessFlags.isSynthetic();
+ boolean syntheticB = b.accessFlags.isSynthetic();
+ if (syntheticA && syntheticB) {
+ return mergeIfLegacySynthetics(reporter, a, b);
+ } else if (syntheticA) {
+ return mergeIfGlobalSynthetic(reporter, a, b);
+ } else if (syntheticB) {
+ return mergeIfGlobalSynthetic(reporter, b, a);
+ }
+ throw reportDuplicateTypes(reporter, a, b);
+ }
+
+ private static DexProgramClass mergeIfGlobalSynthetic(
+ Reporter reporter, DexProgramClass synthetic, DexProgramClass nonSynthetic) {
+ assert synthetic.accessFlags.isSynthetic();
+ assert !nonSynthetic.accessFlags.isSynthetic();
+ if (synthetic.getOrigin() instanceof GlobalsEntryOrigin) {
+ return nonSynthetic;
+ }
+ throw reportDuplicateTypes(reporter, nonSynthetic, synthetic);
+ }
+
+ private static DexProgramClass mergeIfLegacySynthetics(
+ Reporter reporter, DexProgramClass a, DexProgramClass b) {
if (a.type.isLegacySynthesizedTypeAllowedDuplication()) {
assert assertEqualClasses(a, b);
return a;
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeProgramDefinedDuplicateTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeProgramDefinedDuplicateTest.java
new file mode 100644
index 0000000..0a72589
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeProgramDefinedDuplicateTest.java
@@ -0,0 +1,178 @@
+// 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.apimodel;
+
+import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
+import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForDefaultInstanceInitializer;
+import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForMethod;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+import com.android.tools.r8.CompilationMode;
+import com.android.tools.r8.OutputMode;
+import com.android.tools.r8.SingleTestRunResult;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestCompilerBuilder;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.references.Reference;
+import com.android.tools.r8.synthesis.globals.GlobalSyntheticsTestingConsumer;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import java.nio.file.Path;
+import java.util.ArrayList;
+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;
+
+@RunWith(Parameterized.class)
+public class ApiModelMockMergeProgramDefinedDuplicateTest extends TestBase {
+
+ private final AndroidApiLevel mockLevel = AndroidApiLevel.M;
+
+ @Parameter() public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withDexRuntimes().withAllApiLevels().build();
+ }
+
+ private boolean isGreaterOrEqualToMockLevel() {
+ return parameters.isDexRuntime() && parameters.getApiLevel().isGreaterThanOrEqualTo(mockLevel);
+ }
+
+ private void setupTestCompileBuilder(
+ TestCompilerBuilder<?, ?, ?, ?, ?> testBuilder, Class<?> programClass)
+ throws NoSuchMethodException {
+ testBuilder
+ .addProgramClasses(programClass)
+ .addLibraryClasses(LibraryClass.class)
+ .addDefaultRuntimeLibrary(parameters)
+ .setMinApi(parameters.getApiLevel())
+ .apply(ApiModelingTestHelper::enableApiCallerIdentification)
+ .apply(ApiModelingTestHelper::enableStubbingOfClasses)
+ .apply(setMockApiLevelForClass(LibraryClass.class, mockLevel))
+ .apply(setMockApiLevelForDefaultInstanceInitializer(LibraryClass.class, mockLevel))
+ .apply(setMockApiLevelForMethod(LibraryClass.class.getDeclaredMethod("foo"), mockLevel))
+ .apply(setMockApiLevelForMethod(LibraryClass.class.getDeclaredMethod("bar"), mockLevel));
+ }
+
+ private boolean addToBootClasspath() {
+ return parameters.isDexRuntime()
+ && parameters.getRuntime().maxSupportedApiLevel().isGreaterThanOrEqualTo(mockLevel);
+ }
+
+ @Test
+ public void testD8DebugDexFilePerClassFile() throws Exception {
+ testD8Merge(CompilationMode.DEBUG);
+ }
+
+ @Test
+ public void testD8ReleaseDexFilePerClassFile() throws Exception {
+ testD8Merge(CompilationMode.RELEASE);
+ }
+
+ private Path runD8ForClass(
+ Class<?> clazz, GlobalSyntheticsTestingConsumer global, CompilationMode mode)
+ throws Exception {
+ return testForD8()
+ .setMode(mode)
+ .setOutputMode(OutputMode.DexFilePerClassFile)
+ .apply(b -> b.getBuilder().setGlobalSyntheticsConsumer(global))
+ .apply(builder -> setupTestCompileBuilder(builder, clazz))
+ .compile()
+ .writeToZip();
+ }
+
+ public void testD8Merge(CompilationMode mode) throws Exception {
+ List<Path> paths = new ArrayList<>();
+ GlobalSyntheticsTestingConsumer mainGlobals = new GlobalSyntheticsTestingConsumer();
+ GlobalSyntheticsTestingConsumer testCallingFooGlobals = new GlobalSyntheticsTestingConsumer();
+ GlobalSyntheticsTestingConsumer testCallingBarGlobals = new GlobalSyntheticsTestingConsumer();
+ paths.add(runD8ForClass(Main.class, mainGlobals, mode));
+ paths.add(runD8ForClass(TestCallingFoo.class, testCallingFooGlobals, mode));
+ paths.add(runD8ForClass(TestCallingBar.class, testCallingBarGlobals, mode));
+ assertFalse(mainGlobals.hasGlobals());
+ if (isGreaterOrEqualToMockLevel()) {
+ assertFalse(testCallingFooGlobals.hasGlobals());
+ assertFalse(testCallingBarGlobals.hasGlobals());
+ } else {
+ // The TestCallingX does reference the mock and should have globals.
+ assertNotNull(
+ testCallingFooGlobals.getProvider(Reference.classFromClass(TestCallingFoo.class)));
+ assertNotNull(
+ testCallingBarGlobals.getProvider(Reference.classFromClass(TestCallingBar.class)));
+ }
+
+ testForD8()
+ .setMode(mode)
+ .addProgramFiles(paths)
+ // Add the actual LibraryClass definition to the code, thus the globals will need to merge
+ // the synthetic stubs but also disregard them due to a program definition being present.
+ .addProgramClasses(LibraryClass.class)
+ .setMinApi(parameters.getApiLevel())
+ .apply(
+ b ->
+ b.getBuilder()
+ .addGlobalSyntheticsResourceProviders(testCallingFooGlobals.getProviders())
+ .addGlobalSyntheticsResourceProviders(testCallingBarGlobals.getProviders()))
+ .compile()
+ .inspect(this::inspect)
+ .applyIf(addToBootClasspath(), b -> b.addBootClasspathClasses(LibraryClass.class))
+ .run(parameters.getRuntime(), Main.class)
+ .apply(this::checkOutput);
+ }
+
+ private void inspect(CodeInspector inspector) {
+ ClassSubject libraryClassSubject = inspector.clazz(LibraryClass.class);
+ assertThat(libraryClassSubject, isPresent());
+ assertThat(libraryClassSubject.uniqueMethodWithName("foo"), isPresent());
+ assertThat(libraryClassSubject.uniqueMethodWithName("bar"), isPresent());
+ }
+
+ private void checkOutput(SingleTestRunResult<?> runResult) {
+ runResult.assertSuccessWithOutputLines("LibraryClass::foo", "LibraryClass::bar");
+ }
+
+ // Only present form api level 23, but also included in program.
+ public static class LibraryClass {
+
+ public void foo() {
+ System.out.println("LibraryClass::foo");
+ }
+
+ public void bar() {
+ System.out.println("LibraryClass::bar");
+ }
+ }
+
+ public static class TestCallingFoo {
+
+ public static void callFoo() {
+ new LibraryClass().foo();
+ }
+ }
+
+ public static class TestCallingBar {
+
+ public static void callBar() {
+ new LibraryClass().bar();
+ }
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ TestCallingFoo.callFoo();
+ TestCallingBar.callBar();
+ }
+ }
+}
