Version 1.6.84
Revert: Handle collisions during member rebinding
CL: https://r8-review.googlesource.com/49769
Bug: 151480842
Change-Id: I0ff694366fb503ae92d71896513d447841487ab7
Reason for revert: Test failures
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 41b0377..d7b9e56 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "1.6.83";
+ public static final String LABEL = "1.6.84";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/graph/GraphLense.java b/src/main/java/com/android/tools/r8/graph/GraphLense.java
index 25ec8ad..16dab7e 100644
--- a/src/main/java/com/android/tools/r8/graph/GraphLense.java
+++ b/src/main/java/com/android/tools/r8/graph/GraphLense.java
@@ -21,6 +21,7 @@
import java.util.ArrayDeque;
import java.util.Collections;
import java.util.Deque;
+import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.LinkedList;
import java.util.List;
@@ -1011,7 +1012,7 @@
@Override
public Set<DexMethod> lookupMethodInAllContexts(DexMethod method) {
- Set<DexMethod> result = Sets.newIdentityHashSet();
+ Set<DexMethod> result = new HashSet<>();
for (DexMethod previous : previousLense.lookupMethodInAllContexts(method)) {
result.add(methodMap.getOrDefault(previous, previous));
}
diff --git a/src/main/java/com/android/tools/r8/optimize/MemberRebindingAnalysis.java b/src/main/java/com/android/tools/r8/optimize/MemberRebindingAnalysis.java
index c040074..b1114fa 100644
--- a/src/main/java/com/android/tools/r8/optimize/MemberRebindingAnalysis.java
+++ b/src/main/java/com/android/tools/r8/optimize/MemberRebindingAnalysis.java
@@ -166,7 +166,7 @@
method, target, originalClass, targetClass, lookupTarget);
}
}
- builder.map(method, lense.lookupMethod(validTargetFor(target.method, method)), invokeType);
+ builder.map(method, lense.lookupMethod(validTargetFor(target.method, method)));
}
}
}
diff --git a/src/main/java/com/android/tools/r8/optimize/MemberRebindingLense.java b/src/main/java/com/android/tools/r8/optimize/MemberRebindingLense.java
index 95e2772..a845de2 100644
--- a/src/main/java/com/android/tools/r8/optimize/MemberRebindingLense.java
+++ b/src/main/java/com/android/tools/r8/optimize/MemberRebindingLense.java
@@ -9,72 +9,45 @@
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.graph.GraphLense;
import com.android.tools.r8.graph.GraphLense.NestedGraphLense;
-import com.android.tools.r8.ir.code.Invoke;
import com.android.tools.r8.ir.code.Invoke.Type;
import com.google.common.collect.ImmutableMap;
-import java.util.Collections;
-import java.util.IdentityHashMap;
import java.util.Map;
-import java.util.Set;
public class MemberRebindingLense extends NestedGraphLense {
- public static class Builder {
+ public static class Builder extends NestedGraphLense.Builder {
private final AppView<?> appView;
- private final Map<DexField, DexField> fieldMap = new IdentityHashMap<>();
- private final Map<Invoke.Type, Map<DexMethod, DexMethod>> methodMaps = new IdentityHashMap<>();
-
protected Builder(AppView<?> appView) {
this.appView = appView;
}
- public void map(DexField from, DexField to) {
- if (from == to) {
- assert !fieldMap.containsKey(from);
- return;
- }
- fieldMap.put(from, to);
- }
-
- public void map(DexMethod from, DexMethod to, Invoke.Type type) {
- if (from == to) {
- assert !methodMaps.containsKey(type) || methodMaps.get(type).getOrDefault(from, to) == to;
- return;
- }
- Map<DexMethod, DexMethod> methodMap =
- methodMaps.computeIfAbsent(type, ignore -> new IdentityHashMap<>());
- assert methodMap.getOrDefault(from, to) == to;
- methodMap.put(from, to);
- }
-
public GraphLense build(GraphLense previousLense) {
- if (fieldMap.isEmpty() && methodMaps.isEmpty()) {
+ assert typeMap.isEmpty();
+ if (methodMap.isEmpty() && fieldMap.isEmpty()) {
return previousLense;
}
- return new MemberRebindingLense(appView, methodMaps, fieldMap, previousLense);
+ return new MemberRebindingLense(appView, methodMap, fieldMap, previousLense);
}
}
private final AppView<?> appView;
- private final Map<Invoke.Type, Map<DexMethod, DexMethod>> methodMaps;
public MemberRebindingLense(
AppView<?> appView,
- Map<Invoke.Type, Map<DexMethod, DexMethod>> methodMaps,
+ Map<DexMethod, DexMethod> methodMap,
Map<DexField, DexField> fieldMap,
GraphLense previousLense) {
super(
ImmutableMap.of(),
- ImmutableMap.of(),
+ methodMap,
fieldMap,
null,
null,
previousLense,
appView.dexItemFactory());
this.appView = appView;
- this.methodMaps = methodMaps;
}
public static Builder builder(AppView<?> appView) {
@@ -82,28 +55,6 @@
}
@Override
- public boolean isLegitimateToHaveEmptyMappings() {
- return true;
- }
-
- @Override
- public GraphLenseLookupResult lookupMethod(DexMethod method, DexMethod context, Type type) {
- GraphLenseLookupResult previous = previousLense.lookupMethod(method, context, type);
- Map<DexMethod, DexMethod> methodMap = methodMaps.getOrDefault(type, Collections.emptyMap());
- DexMethod newMethod = methodMap.get(previous.getMethod());
- if (newMethod != null) {
- return new GraphLenseLookupResult(
- newMethod, mapInvocationType(newMethod, method, previous.getType()));
- }
- return previous;
- }
-
- @Override
- public Set<DexMethod> lookupMethodInAllContexts(DexMethod method) {
- return previousLense.lookupMethodInAllContexts(method);
- }
-
- @Override
protected Type mapInvocationType(DexMethod newMethod, DexMethod originalMethod, Type type) {
return super.mapVirtualInterfaceInvocationTypes(appView, newMethod, originalMethod, type);
}
