diff --git a/flang/test/Fir/fir-types.fir b/flang/test/Fir/fir-types.fir --- a/flang/test/Fir/fir-types.fir +++ b/flang/test/Fir/fir-types.fir @@ -25,12 +25,14 @@ // CHECK-LABEL: func private @dvd4() -> !fir.type // CHECK-LABEL: func private @dvd5() -> !fir.type // CHECK-LABEL: func private @dvd6() -> !fir.type>}> +// CHECK-LABEL: func private @dvd7() -> !fir.type func private @dvd1() -> !fir.type func private @dvd2() -> !fir.type func private @dvd3() -> !fir.type func private @dvd4() -> !fir.type func private @dvd5() -> !fir.type func private @dvd6() -> !fir.type>}> +func private @dvd7() -> !fir.type // FIR array types // CHECK-LABEL: func private @arr1() -> !fir.array<10xf32> diff --git a/mlir/lib/Parser/DialectSymbolParser.cpp b/mlir/lib/Parser/DialectSymbolParser.cpp --- a/mlir/lib/Parser/DialectSymbolParser.cpp +++ b/mlir/lib/Parser/DialectSymbolParser.cpp @@ -250,7 +250,7 @@ /// Returns true if the current token corresponds to a keyword. bool isCurrentTokenAKeyword() const { - return parser.getToken().is(Token::bare_identifier) || + return parser.getToken().isAny(Token::bare_identifier, Token::inttype) || parser.getToken().isKeyword(); }