Fix an NPE in constant expression binding of malformed annotations

MOE_MIGRATED_REVID=226028069

2 files changed, 18 insertions, 0 deletions

diff --git a/java/com/google/turbine/binder/ConstEvaluator.java b/java/com/google/turbine/binder/ConstEvaluator.java
index d565cee..6db85e1 100644
--- a/java/com/google/turbine/binder/ConstEvaluator.java
+++ b/java/com/google/turbine/binder/ConstEvaluator.java
@@ -953,6 +953,9 @@ public strictfp class ConstEvaluator {
     for (Ident name : result.remaining()) {
       sym = Resolve.resolve(env, sym, sym, name);
     }
+    if (sym == null) {
+      return null;
+    }
     AnnoInfo annoInfo = evaluateAnnotation(new AnnoInfo(source, sym, t, null));
     return new AnnotationValue(annoInfo.sym(), annoInfo.values());
   }
diff --git a/javatests/com/google/turbine/binder/BinderErrorTest.java b/javatests/com/google/turbine/binder/BinderErrorTest.java
index 737339b..5e6b9f1 100644
--- a/javatests/com/google/turbine/binder/BinderErrorTest.java
+++ b/javatests/com/google/turbine/binder/BinderErrorTest.java
@@ -504,6 +504,21 @@ public class BinderErrorTest {
           " ^",
         },
       },
+      {
+        {
+          "package p;", //
+          "import java.lang.annotation.Retention;",
+          "import java.lang.annotation.RetentionPolicy;",
+          "@Retention(@RetentionPolicy.RUNTIME)",
+          "public @interface A {",
+          "}",
+        },
+        {
+          "<>:4: error: could not evaluate constant expression",
+          "@Retention(@RetentionPolicy.RUNTIME)",
+          "                                   ^",
+        },
+      },
     };
     return Arrays.asList((Object[][]) testCases);
   }