commit c85a33805a00fb7eead6833f9a5d3282e3f4f6c6
author Ian Zerny <zerny@google.com> Fri Jan 17 12:32:22 2020 +0100
committer Ian Zerny <zerny@google.com> Fri Jan 17 12:32:22 2020 +0100
tree 9d237f92d9236f3c1c4af1cc27511a8bb54bc891
parent ee0724279d2c229178007d4ae31ffbb52319c779

Only run library converter once.

Change-Id: I6e0b8c7f8b2bc7c6a399d5dc58332b5a75bf5104

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index f3dd806..028a397 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -1344,7 +1344,8 @@
     previous = printMethod(code, "IR after interface method rewriting (SSA)", previous);
 
     // This pass has to be after interfaceMethodRewriter and BackportedMethodRewriter.
-    if (desugaredLibraryAPIConverter != null) {
+    if (desugaredLibraryAPIConverter != null
+        && (!appView.enableWholeProgramOptimizations() || methodProcessor.isPrimary())) {
       desugaredLibraryAPIConverter.desugar(code);
       assert code.isConsistentSSA();
     }