commit 4a55edd2eabdb76b11a1a1acef72d1bff4bc36ca
author Liam Miller-Cushon <cushon@google.com> Mon Aug 23 16:41:38 2021 -0700
committer Javac Team <javac-team+copybara@google.com> Mon Aug 23 16:42:08 2021 -0700
tree 4c892261a7b7b0d0f9e5f5fc29822c88ff0f6ce9
parent 6a3281d2ff91ee6b8261f606d91b22b1b756ea9a

Fix an NPE

PiperOrigin-RevId: 392546577

java/com/google/turbine/parse/ConstExpressionParser.java

diff --git a/java/com/google/turbine/parse/ConstExpressionParser.java b/java/com/google/turbine/parse/ConstExpressionParser.java
index fa5556a..db144cf 100644
--- a/java/com/google/turbine/parse/ConstExpressionParser.java
+++ b/java/com/google/turbine/parse/ConstExpressionParser.java
@@ -17,7 +17,6 @@
 package com.google.turbine.parse;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
-import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CheckReturnValue;
@@ -232,9 +231,11 @@
         case NOT:
         case TILDE:
         case IDENT:
-          // primary returns non-null for these token kinds
-          return new Tree.TypeCast(
-              position, asClassTy(cvar.position(), cvar.name()), requireNonNull(primary(false)));
+          Expression expression = primary(false);
+          if (expression == null) {
+            throw error(ErrorKind.EXPRESSION_ERROR);
+          }
+          return new Tree.TypeCast(position, asClassTy(cvar.position(), cvar.name()), expression);
         default:
           return expr;
       }

javatests/com/google/turbine/parse/ParseErrorTest.java

diff --git a/javatests/com/google/turbine/parse/ParseErrorTest.java b/javatests/com/google/turbine/parse/ParseErrorTest.java
index 5fcfc88..2c48b81 100644
--- a/javatests/com/google/turbine/parse/ParseErrorTest.java
+++ b/javatests/com/google/turbine/parse/ParseErrorTest.java
@@ -294,6 +294,19 @@
                 "   ^"));
   }
 
+  @Test
+  public void notCast() {
+    String input = "@j(@truetugt^(oflur)!%t";
+    TurbineError e = assertThrows(TurbineError.class, () -> Parser.parse(input));
+    assertThat(e)
+        .hasMessageThat()
+        .isEqualTo(
+            lines(
+                "<>:1: error: could not evaluate constant expression",
+                "@j(@truetugt^(oflur)!%t",
+                "                     ^"));
+  }
+
   private static String lines(String... lines) {
     return Joiner.on(System.lineSeparator()).join(lines);
   }