Allow classifying class initializers with constants as trivial

Change-Id: I22a953f56d746160fd6b4ad3eaa35b9b242e1974

src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
index d0bd538..c3b080a 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
@@ -1274,6 +1274,17 @@
     while (it.hasNext()) {
       Instruction insn = it.next();
 
+      if (insn.isConstNumber()) {
+        continue;
+      }
+
+      if (insn.isConstString()) {
+        if (insn.instructionInstanceCanThrow()) {
+          return null;
+        }
+        continue;
+      }
+
       if (insn.isReturn()) {
         continue;
       }