commit 8dc6564609f9ac1baa244d3a533dcfaf445e1296
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Jun 07 11:22:58 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Jun 07 13:14:57 2021 +0000
tree 00626060709c330201936e4b3ab3ffca932758f9
parent 48872d731d8cc9a751f88e6b0e90a65c6b30349d

Fix nondeterminism in emulated interface method code generation

Bug: 190335834
Change-Id: I7bf98c6b9864a14f6f5e3d79dd492213ee057e74

src/main/java/com/android/tools/r8/ir/desugar/itf/EmulatedInterfaceProcessor.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/itf/EmulatedInterfaceProcessor.java b/src/main/java/com/android/tools/r8/ir/desugar/itf/EmulatedInterfaceProcessor.java
index cf86667..30fc05c 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/itf/EmulatedInterfaceProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/itf/EmulatedInterfaceProcessor.java
@@ -245,6 +245,8 @@
                           companionMethod.name)));
         }
       }
+    } else {
+      assert extraDispatchCases.size() <= 1;
     }
     return extraDispatchCases;
   }