Handle lookup exceptions in Tracer

Change-Id: I977d508b77162f5874af30929ce248d3650f262a

2 files changed, 9 insertions, 2 deletions

diff --git a/jack/src/com/android/jack/analysis/tracer/Tracer.java b/jack/src/com/android/jack/analysis/tracer/Tracer.java
index 777e13d..bf93886 100644
--- a/jack/src/com/android/jack/analysis/tracer/Tracer.java
+++ b/jack/src/com/android/jack/analysis/tracer/Tracer.java
@@ -58,6 +58,7 @@ import com.android.jack.ir.ast.JTypeStringLiteral;
 import com.android.jack.ir.ast.JVariable;
 import com.android.jack.ir.ast.JVisitor;
 import com.android.jack.ir.ast.marker.ThrownExceptionMarker;
+import com.android.jack.lookup.JMethodLookupException;
 import com.android.sched.item.Description;
 import com.android.sched.marker.LocalMarkerManager;
 import com.android.sched.util.log.LoggerFactory;
@@ -175,8 +176,13 @@ public class Tracer extends JVisitor {
 
         if (t instanceof JDefinedEnum) {
           // The values() method is needed for the switches on enum support
-          JMethod values = definedClass.getMethod("values", definedClass.getArray());
-          trace(values);
+          try {
+            JMethod values = definedClass.getMethod("values", definedClass.getArray());
+            trace(values);
+          } catch (JMethodLookupException e) {
+            // A valid enum must have a values() method
+            throw new AssertionError(e);
+          }
         }
       }
 
diff --git a/jack/src/com/android/jack/transformations/enums/SwitchEnumSupport.java b/jack/src/com/android/jack/transformations/enums/SwitchEnumSupport.java
index 917d2b8..ee8fcbf 100644
--- a/jack/src/com/android/jack/transformations/enums/SwitchEnumSupport.java
+++ b/jack/src/com/android/jack/transformations/enums/SwitchEnumSupport.java
@@ -294,6 +294,7 @@ public class SwitchEnumSupport implements RunnableSchedulable<JMethod> {
         try {
           valuesMethod = enumType.getMethod("values", enumArrayType);
         } catch (JMethodLookupException e1) {
+          // A valid enum must have a values() method
           throw new AssertionError(e1);
         }