commit c4adf508ebcbcadd88d59a1a70046a2cbcdebf56
author Søren Gjesse <sgjesse@google.com> Tue Sep 17 16:39:29 2019 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Sep 18 07:55:13 2019 +0000
tree bad45d58702da8f282a385d1b9a39ed31eb81503
parent 44fa016fd14b1719af30df69b4efc319f322ae5a

Turn NullPointerException during IR into CompilationError

This should give information the exact method that caused the
NullPointerException.

Bug: 137354064
Change-Id: I60a7480573d44a49d694099245f870c91ea187e7

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 ffa7d3d..4a0ab85 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
@@ -989,6 +989,12 @@
     } catch (CompilationError e) {
       // If rewriting throws a compilation error, attach the origin and method if missing.
       throw e.withAdditionalOriginAndPositionInfo(origin, new MethodPosition(method.method));
+    } catch (NullPointerException e) {
+      throw new CompilationError(
+          "NullPointerException during IR Conversion",
+          e,
+          origin,
+          new MethodPosition(method.method));
     }
   }