commit 7dbda34ffa9908244b2b4af5dcc9b45bdcae5315
author clementbera <clementbera@google.com> Tue Oct 08 09:46:32 2019 +0200
committer Clément Béra <clementbera@google.com> Tue Oct 08 09:56:08 2019 +0000
tree 35f978e453187ad80a291dd21a627c5c5bba3473
parent 0a8d3c8e9c78e4f36401fe0ae87c20445c772fc2

Desugared API minor clean-up

Bug: 134732760
Change-Id: I22374ada8fb68212e8fd5e9ecdd585bffd2863b2

src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryWrapperSynthesizer.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryWrapperSynthesizer.java b/src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryWrapperSynthesizer.java
index a9c70ca..a2d2605 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryWrapperSynthesizer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryWrapperSynthesizer.java
@@ -382,8 +382,7 @@
           // This looks quadratic but given the size of the collections met in practice for
           // desugared libraries (Max ~15) it does not matter.
           for (DexEncodedMethod alreadyImplementedMethod : implementedMethods) {
-            if (alreadyImplementedMethod.method.proto == virtualMethod.method.proto
-                && alreadyImplementedMethod.method.name == virtualMethod.method.name) {
+            if (alreadyImplementedMethod.method.match(virtualMethod.method)) {
               alreadyAdded = true;
               continue;
             }