commit 4172a3c51b525d2c4e8af85c4854f5bb1d0b6f07
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Mar 02 07:39:16 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Mar 02 08:56:03 2020 +0000
tree 222e520dfafc09b07e4e8f3c40d02dce0a4148c2
parent c245b7bb2cefac653545ba9b0d4291a068cad821

Fix NPE arising from the absence of synthesized type

Change-Id: Ie14a353c70f5382011cbf53c75235ea2a312165c
Bug: 150508871

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 985961e..9dd958f 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
@@ -754,6 +754,7 @@
     generateDesugaredLibraryAPIWrappers(builder, executorService);
 
     if (serviceLoaderRewriter != null && serviceLoaderRewriter.getSynthesizedClass() != null) {
+      appView.appInfo().addSynthesizedClass(serviceLoaderRewriter.getSynthesizedClass());
       processSynthesizedServiceLoaderMethods(
           serviceLoaderRewriter.getSynthesizedClass(), executorService);
       builder.addSynthesizedClass(serviceLoaderRewriter.getSynthesizedClass(), true);