commit 4d5774a2d9bebb2951a431437e265809a20808c8
author Mads Ager <ager@google.com> Fri May 25 11:49:22 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 25 11:49:22 2018 +0000
tree 7eb4f1242fbf509d56061098c0277ae8463bdcdf
parent f334596d22f78a5645db35f3adbed8b152ab7b7a
parent c3d99394d2a502ef4bd7d42a28c864f03da1eaba

Merge "Report errors for non-existant flag files correctly."

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

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index d4fcc67..d718026 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -739,7 +739,6 @@
       transitionNonAbstractMethodsToLiveAndShadow(
           reachableMethods.getItems(), instantiatedType, seen.newNestedScope());
     }
-    seen = seen.newNestedScope();
     for (DexType subInterface : clazz.interfaces.values) {
       transitionDefaultMethodsForInstantiatedClass(subInterface, instantiatedType, seen);
     }