commit f21acf1ebc4886d2447b0ceef9a65e77dcc027e3
author Jake Wharton <jakew@google.com> Wed Sep 18 21:28:45 2019 -0400
committer Jake Wharton <jakew@google.com> Thu Sep 19 12:48:54 2019 +0000
tree 950fae668f096ae5c7ebfa89bdd7dccfebbded7f
parent c0333a45bbeb8f45e443ffc97a422ac62fea9e61

Reuse cached DexMethod for requireNonNull

Change-Id: I451cf2486642892371e42a3cbb29117e473bb1fe

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

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
index 86417a1..ba3615c 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
@@ -345,9 +345,7 @@
       addProvider(new MethodGenerator(method, BackportedMethods::ObjectsMethods_hashCode));
 
       // T Objects.requireNonNull(T obj)
-      name = factory.createString("requireNonNull");
-      proto = factory.createProto(factory.objectType, factory.objectType);
-      method = factory.createMethod(type, proto, name);
+      method = factory.objectsMethods.requireNonNull;
       addProvider(new InvokeRewriter(method, ObjectsMethodRewrites::rewriteRequireNonNull));
 
       // T Objects.requireNonNull(T obj, String message)