Remove MethodPoolCollection
Change-Id: I3b40dfedfe52838fea7f5edee99de2eac637f7b8
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/MemberPoolCollection.java b/src/main/java/com/android/tools/r8/ir/optimize/MemberPoolCollection.java
deleted file mode 100644
index a4ccb28..0000000
--- a/src/main/java/com/android/tools/r8/ir/optimize/MemberPoolCollection.java
+++ /dev/null
@@ -1,179 +0,0 @@
-// 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.ir.optimize;
-
-import com.android.tools.r8.graph.AppView;
-import com.android.tools.r8.graph.DexClass;
-import com.android.tools.r8.graph.DexMember;
-import com.android.tools.r8.graph.SubtypingInfo;
-import com.android.tools.r8.graph.TopDownClassHierarchyTraversal;
-import com.android.tools.r8.shaking.AppInfoWithLiveness;
-import com.android.tools.r8.threading.TaskCollection;
-import com.android.tools.r8.utils.Timing;
-import com.android.tools.r8.utils.UncheckedExecutionException;
-import com.android.tools.r8.utils.WorkList;
-import com.google.common.base.Equivalence;
-import com.google.common.base.Equivalence.Wrapper;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.function.BiFunction;
-
-// Per-class collection of member signatures.
-public abstract class MemberPoolCollection<R extends DexMember<?, R>> {
-
- final Equivalence<R> equivalence;
- final AppView<AppInfoWithLiveness> appView;
- final SubtypingInfo subtypingInfo;
- final Map<DexClass, MemberPool<R>> memberPools = new ConcurrentHashMap<>();
-
- MemberPoolCollection(
- AppView<AppInfoWithLiveness> appView,
- Equivalence<R> equivalence,
- SubtypingInfo subtypingInfo) {
- this.appView = appView;
- this.equivalence = equivalence;
- this.subtypingInfo = subtypingInfo;
- }
-
- public void buildAll(ExecutorService executorService, Timing timing) throws ExecutionException {
- timing.begin("Building member pool collection");
- // Generate a future for each class that will build the member pool collection for the
- // corresponding class. Note that, we visit the classes using a top-down class hierarchy
- // traversal, since this ensures that we do not visit library classes that are not
- // reachable from any program class.
- TaskCollection<?> tasks = new TaskCollection<>(appView.options(), executorService);
- try {
- TopDownClassHierarchyTraversal.forAllClasses(appView)
- .visit(
- appView.appInfo().classes(),
- clazz -> tasks.submitUnchecked(() -> computeMemberPoolForClass(clazz).run()));
- tasks.await();
- } catch (UncheckedExecutionException e) {
- throw e.rethrow();
- }
- }
-
- public boolean hasPool(DexClass clazz) {
- return memberPools.containsKey(clazz);
- }
-
- public MemberPool<R> get(DexClass clazz) {
- assert hasPool(clazz);
- return memberPools.get(clazz);
- }
-
- public boolean markIfNotSeen(DexClass clazz, R reference) {
- MemberPool<R> memberPool = get(clazz);
- Wrapper<R> key = equivalence.wrap(reference);
- if (memberPool.hasSeen(key)) {
- return true;
- }
- memberPool.seen(key);
- return false;
- }
-
- abstract Runnable computeMemberPoolForClass(DexClass clazz);
-
- public static class MemberPool<T> {
-
- private final DexClass clazz;
- private final Equivalence<T> equivalence;
- private MemberPool<T> superType;
- private final Set<MemberPool<T>> interfaces = new HashSet<>();
- private final Set<MemberPool<T>> subTypes = new HashSet<>();
- private final Set<Wrapper<T>> memberPool = new HashSet<>();
-
- MemberPool(Equivalence<T> equivalence, DexClass clazz) {
- this.equivalence = equivalence;
- this.clazz = clazz;
- }
-
- synchronized void linkSupertype(MemberPool<T> superType) {
- assert this.superType == null;
- this.superType = superType;
- }
-
- synchronized void linkSubtype(MemberPool<T> subType) {
- boolean added = subTypes.add(subType);
- assert added;
- }
-
- synchronized void linkInterface(MemberPool<T> itf) {
- boolean added = interfaces.add(itf);
- assert added;
- }
-
- public void seen(T member) {
- seen(equivalence.wrap(member));
- }
-
- public synchronized void seen(Wrapper<T> member) {
- boolean added = memberPool.add(member);
- assert added;
- }
-
- public boolean hasSeen(Wrapper<T> member) {
- return fold(member, false, true, (t, ignored) -> true);
- }
-
- private <S> S above(
- Wrapper<T> member,
- boolean inclusive,
- S value,
- S terminator,
- BiFunction<DexClass, S, S> accumulator) {
- WorkList<MemberPool<T>> workList = WorkList.newIdentityWorkList(this);
- while (workList.hasNext()) {
- MemberPool<T> next = workList.next();
- if (inclusive) {
- value = next.here(member, value, accumulator);
- if (value == terminator) {
- return value;
- }
- }
- inclusive = true;
- if (next.superType != null) {
- workList.addIfNotSeen(next.superType);
- }
- workList.addIfNotSeen(next.interfaces);
- }
- return value;
- }
-
- private <S> S here(Wrapper<T> member, S value, BiFunction<DexClass, S, S> accumulator) {
- if (memberPool.contains(member)) {
- return accumulator.apply(clazz, value);
- }
- return value;
- }
-
- public <S> S below(
- Wrapper<T> member, S value, S terminator, BiFunction<DexClass, S, S> accumulator) {
- WorkList<MemberPool<T>> workList = WorkList.newIdentityWorkList(this.subTypes);
- while (workList.hasNext()) {
- MemberPool<T> next = workList.next();
- value = next.here(member, value, accumulator);
- if (value == terminator) {
- return value;
- }
- workList.addIfNotSeen(next.interfaces);
- workList.addIfNotSeen(next.subTypes);
- }
- return value;
- }
-
- public <S> S fold(
- Wrapper<T> member, S initialValue, S terminator, BiFunction<DexClass, S, S> accumulator) {
- S value = above(member, true, initialValue, terminator, accumulator);
- if (value == terminator) {
- return value;
- }
- return below(member, initialValue, terminator, accumulator);
- }
- }
-}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/MethodPoolCollection.java b/src/main/java/com/android/tools/r8/ir/optimize/MethodPoolCollection.java
deleted file mode 100644
index 3b5d81f..0000000
--- a/src/main/java/com/android/tools/r8/ir/optimize/MethodPoolCollection.java
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2018, 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.ir.optimize;
-
-import com.android.tools.r8.graph.AppView;
-import com.android.tools.r8.graph.DexClass;
-import com.android.tools.r8.graph.DexEncodedMethod;
-import com.android.tools.r8.graph.DexMethod;
-import com.android.tools.r8.graph.DexType;
-import com.android.tools.r8.graph.SubtypingInfo;
-import com.android.tools.r8.shaking.AppInfoWithLiveness;
-import com.android.tools.r8.utils.MethodSignatureEquivalence;
-import java.util.function.Predicate;
-
-// Per-class collection of method signatures.
-//
-// Example use cases:
-// *) in publicizer,
-// to determine if a private method does not collide with methods in that class hierarchy.
-// *) in vertical class merger,
-// before moving a default interface method to its subtype, check if it does not collide with one
-// in the given class hierarchy.
-public class MethodPoolCollection extends MemberPoolCollection<DexMethod> {
-
- private final Predicate<DexEncodedMethod> methodTester;
-
- public MethodPoolCollection(
- AppView<AppInfoWithLiveness> appView,
- SubtypingInfo subtypingInfo,
- Predicate<DexEncodedMethod> methodTester) {
- super(appView, MethodSignatureEquivalence.get(), subtypingInfo);
- this.methodTester = methodTester;
- }
-
- public static boolean excludesPrivateInstanceMethod(DexEncodedMethod method) {
- return !method.isPrivateMethod() || method.isStatic();
- }
-
- @Override
- Runnable computeMemberPoolForClass(DexClass clazz) {
- return () -> {
- MemberPool<DexMethod> methodPool =
- memberPools.computeIfAbsent(clazz, k -> new MemberPool<>(equivalence, k));
- clazz.forEachMethod(
- encodedMethod -> {
- if (methodTester.test(encodedMethod)) {
- methodPool.seen(equivalence.wrap(encodedMethod.getReference()));
- }
- });
- if (clazz.superType != null) {
- DexClass superClazz = appView.definitionFor(clazz.superType);
- if (superClazz != null) {
- MemberPool<DexMethod> superPool =
- memberPools.computeIfAbsent(
- superClazz, k -> new MemberPool<>(equivalence, superClazz));
- superPool.linkSubtype(methodPool);
- methodPool.linkSupertype(superPool);
- }
- }
- if (clazz.isInterface()) {
- for (DexType subtype : subtypingInfo.allImmediateSubtypes(clazz.type)) {
- DexClass subClazz = appView.definitionFor(subtype);
- if (subClazz != null) {
- MemberPool<DexMethod> childPool =
- memberPools.computeIfAbsent(subClazz, k -> new MemberPool<>(equivalence, subClazz));
- methodPool.linkSubtype(childPool);
- childPool.linkInterface(methodPool);
- }
- }
- }
- };
- }
-}
