Dont merge synchronized classes
Bug: 165720389
Bug: 165000217
Change-Id: I22eb7a3d568152cd8b2dee4ca83befa9b78d6133
diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java
index e71a8b2..c993870 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java
@@ -7,6 +7,7 @@
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DexProgramClass;
import com.android.tools.r8.graph.DirectMappedDexApplication;
+import com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses;
import com.android.tools.r8.horizontalclassmerging.policies.NoAnnotations;
import com.android.tools.r8.horizontalclassmerging.policies.NoFields;
import com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses;
@@ -55,7 +56,8 @@
new NotEntryPoint(appView.dexItemFactory()),
new PreventMergeIntoMainDex(appView, mainDexTracingResult),
new SameParentClass(),
- new RespectPackageBoundaries(appView)
+ new RespectPackageBoundaries(appView),
+ new DontMergeSynchronizedClasses(appView)
// TODO: add policies
);
diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/policies/DontMergeSynchronizedClasses.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/policies/DontMergeSynchronizedClasses.java
new file mode 100644
index 0000000..958e660
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/policies/DontMergeSynchronizedClasses.java
@@ -0,0 +1,58 @@
+// 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.horizontalclassmerging.policies;
+
+import com.android.tools.r8.graph.AppView;
+import com.android.tools.r8.graph.DexProgramClass;
+import com.android.tools.r8.horizontalclassmerging.MultiClassPolicy;
+import com.android.tools.r8.shaking.AppInfoWithLiveness;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+public class DontMergeSynchronizedClasses extends MultiClassPolicy {
+ private final AppView<AppInfoWithLiveness> appView;
+
+ public DontMergeSynchronizedClasses(AppView<AppInfoWithLiveness> appView) {
+ this.appView = appView;
+ }
+
+ private boolean isSynchronizationClass(DexProgramClass clazz) {
+ return appView.appInfo().isLockCandidate(clazz.type) || clazz.hasStaticSynchronizedMethods();
+ }
+
+ @Override
+ public Collection<Collection<DexProgramClass>> apply(Collection<DexProgramClass> group) {
+ // Gather all synchronized classes.
+ Collection<Collection<DexProgramClass>> synchronizedGroups = new LinkedList<>();
+ group.removeIf(
+ clazz -> {
+ boolean synchronizationClass = isSynchronizationClass(clazz);
+ if (synchronizationClass) {
+ Collection<DexProgramClass> synchronizedGroup = new LinkedList<>();
+ synchronizedGroup.add(clazz);
+ synchronizedGroups.add(synchronizedGroup);
+ }
+ return synchronizationClass;
+ });
+
+ if (synchronizedGroups.isEmpty()) {
+ return Collections.singletonList(group);
+ }
+
+ Iterator<Collection<DexProgramClass>> synchronizedGroupIterator = synchronizedGroups.iterator();
+ for (DexProgramClass clazz : group) {
+ if (!synchronizedGroupIterator.hasNext()) {
+ synchronizedGroupIterator = synchronizedGroups.iterator();
+ }
+ synchronizedGroupIterator.next().add(clazz);
+ }
+
+ removeTrivialGroups(synchronizedGroups);
+
+ return synchronizedGroups;
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java
new file mode 100644
index 0000000..e5c77a3
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java
@@ -0,0 +1,103 @@
+// 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.horizontal;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsNot.not;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import org.junit.Test;
+
+public class SynchronizedClassesTest extends HorizontalClassMergingTestBase {
+ public SynchronizedClassesTest(TestParameters parameters, boolean enableHorizontalClassMerging) {
+ super(parameters, enableHorizontalClassMerging);
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addKeepMainRule(Main.class)
+ .addOptionsModification(
+ options -> {
+ options.enableHorizontalClassMerging = enableHorizontalClassMerging;
+ })
+ .enableInliningAnnotations()
+ .enableNeverClassInliningAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("foo", "b", "bar", "1", "true")
+ .inspect(
+ codeInspector -> {
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), isPresent());
+ if (enableHorizontalClassMerging) {
+ // C has been merged into A.
+ assertThat(codeInspector.clazz(C.class), not(isPresent()));
+ assertThat(codeInspector.clazz(A.class).init("long"), isPresent());
+
+ // D has been merged into B.
+ assertThat(codeInspector.clazz(D.class), not(isPresent()));
+ ClassSubject bClassSubject = codeInspector.clazz(B.class);
+ assertThat(bClassSubject.init("boolean"), isPresent());
+ } else {
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), isPresent());
+ }
+ });
+ }
+
+ @NeverClassInline
+ public static class A {
+ @NeverInline
+ static synchronized void foo() {
+ System.out.println("foo");
+ }
+ }
+
+ @NeverClassInline
+ public static class B {
+ public B(String foo) {
+ System.out.println(foo);
+ }
+
+ @NeverInline
+ void bar() {
+ synchronized (B.class) {
+ System.out.println("bar");
+ }
+ }
+ }
+
+ @NeverClassInline
+ public static class C {
+ public C(long v) {
+ System.out.println(v);
+ }
+ }
+
+ @NeverClassInline
+ public static class D {
+ public D(boolean v) {
+ System.out.println(v);
+ }
+ }
+
+ public static class Main {
+ public static void main(String[] args) {
+ A a = new A();
+ A.foo();
+ B b = new B("b");
+ b.bar();
+ C c = new C(1);
+ D d = new D(true);
+ }
+ }
+}
