commit c4b99c0aab43283042091d712c3aa3e4b6cfbc9b
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Dec 21 12:11:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 21 12:11:53 2018 +0000
tree be0b4f69fa2aace0ee5c0254227c0f8e301f5c9f
parent 5cb7c304d577d971127f3acdd526a1f70d602c45
parent 9475251d22f673bbd05e2412c10272cf55541cd0

Merge "Update RootSetBuilder.verifyKeptItemsAreKept()"

src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java

diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java b/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
index 374553a..7dde660 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
@@ -1119,11 +1119,21 @@
       for (DexProgramClass clazz : application.classes()) {
         Set<DexDefinition> requiredDefinitions =
             requiredDefinitionsPerType.getOrDefault(clazz.type, ImmutableSet.of());
+
+        Set<DexField> fields = null;
+        Set<DexMethod> methods = null;
+
         for (DexDefinition requiredDefinition : requiredDefinitions) {
           if (requiredDefinition.isDexEncodedField()) {
             DexEncodedField requiredField = requiredDefinition.asDexEncodedField();
-            assert Streams.stream(clazz.fields())
-                .anyMatch(field -> field.field == requiredField.field);
+            if (fields == null) {
+              // Create a Set of the fields to avoid quadratic behavior.
+              fields =
+                  Streams.stream(clazz.fields())
+                      .map(DexEncodedField::getKey)
+                      .collect(Collectors.toSet());
+            }
+            assert fields.contains(requiredField.field);
           } else if (requiredDefinition.isDexEncodedMethod()) {
             DexEncodedMethod requiredMethod = requiredDefinition.asDexEncodedMethod();
             if (isInterfaceMethodDesugaringEnabled) {
@@ -1133,8 +1143,14 @@
                 continue;
               }
             }
-            assert Streams.stream(clazz.methods())
-                .anyMatch(method -> method.method == requiredMethod.method);
+            if (methods == null) {
+              // Create a Set of the methods to avoid quadratic behavior.
+              methods =
+                  Streams.stream(clazz.methods())
+                      .map(DexEncodedMethod::getKey)
+                      .collect(Collectors.toSet());
+            }
+            assert methods.contains(requiredMethod.method);
           } else {
             assert false;
           }