@@ -2684,18 +2684,29 @@ private void visitToDeclare(
             Optional<String> trailing,
             Optional<BreakTag> annotationBreakForRecords) {
         sync(node);
+        Optional<TypeWithDims> typeWithDims;
+        Tree type;
+        if (node.getType() != null) {
+            TypeWithDims extractedDims = DimensionHelpers.extractDims(node.getType(), SortedDims.YES);
+            typeWithDims = Optional.of(extractedDims);
+            type = extractedDims.node;
+        } else {
+            // "var" and an untyped lambda parameter have no type tree
+            typeWithDims = Optional.empty();
+            type = null;
+        }
         declareOne(
                 kind,
                 annotationsDirection,
                 Optional.of(node.getModifiers()),
-                node.getType(),
+                type,
                 node.getName(),
                 "",
                 equals,
                 initializer,
                 trailing,
                 /* receiverExpression= */ Optional.empty(),
-                /* typeWithDims= */ Optional.empty(),
+                typeWithDims,
                 annotationBreakForRecords);
     }
 
 
@@ -0,0 +1,9 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface MyTypeAnno {}
+
+public class GjfFailure {
+  void m(int a @MyTypeAnno []) {}
+}
@@ -0,0 +1,9 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface MyTypeAnno {}
+
+public class GjfFailure {
+    void m(int a @MyTypeAnno []) {}
+}