Propagate locations in box/ref type parsers

Author: ashermancinelli

flang/lib/Optimizer/Dialect/FIROps.cpp

@@ -1357,9 +1357,7 @@ llvm::LogicalResult fir::VolatileCastOp::verify() {
        mlir::isa<fir::ReferenceType>(toType));
   bool sameElementType = fir::dyn_cast_ptrOrBoxEleTy(fromType) ==
                          fir::dyn_cast_ptrOrBoxEleTy(toType);
-  if (fromType == toType ||
-      fir::isa_volatile_type(fromType) == fir::isa_volatile_type(toType) ||
-      !sameBaseType || !sameElementType)
+  if (!sameBaseType || !sameElementType)
     return emitOpError("types must be identical except for volatility ")
            << fromType << " / " << toType;
   return mlir::success();

flang/lib/Optimizer/Dialect/FIRType.cpp

@@ -136,7 +136,7 @@ mlir::Type fir::parseFirType(FIROpsDialect *dialect,
   auto parseResult = generatedTypeParser(parser, &typeTag, genType);
   if (parseResult.has_value())
     return genType;
-  parser.emitError(parser.getNameLoc(), "unknown fir type: ") << typeTag;
+  parser.emitError(parser.getCurrentLocation(), "unknown fir type: ") << typeTag;
   return {};
 }
 
@@ -770,12 +770,13 @@ fir::BoxType::verify(llvm::function_ref<mlir::InFlightDiagnostic()> emitError,
 
 mlir::Type fir::BoxType::parse(mlir::AsmParser &parser) {
   mlir::Type ty;
-  bool isVolatile;
+  bool isVolatile = false;
+  auto loc = parser.getCurrentLocation();
   if (parser.parseLess() || parser.parseType(ty) ||
       parseOptionalCommaAndKeyword(parser, getVolatileKeyword(), isVolatile) ||
       parser.parseGreater())
     return {};
-  return get(ty, isVolatile);
+  return parser.getChecked<BoxType>(loc, parser.getContext(), ty, isVolatile);
 }
 
 void fir::BoxType::print(mlir::AsmPrinter &printer) const {
@@ -1098,12 +1099,13 @@ unsigned fir::RecordType::getFieldIndex(llvm::StringRef ident) {
 // `ref` `<` type (`, volatile` $volatile^)? `>`
 mlir::Type fir::ReferenceType::parse(mlir::AsmParser &parser) {
   mlir::Type ty;
-  bool isVolatile;
+  bool isVolatile = false;
+  auto loc = parser.getCurrentLocation();
   if (parser.parseLess() || parser.parseType(ty) ||
       parseOptionalCommaAndKeyword(parser, getVolatileKeyword(), isVolatile) ||
       parser.parseGreater())
     return {};
-  return get(ty, isVolatile);
+  return parser.getChecked<ReferenceType>(loc, parser.getContext(), ty, isVolatile);
 }
 
 void fir::ReferenceType::print(mlir::AsmPrinter &printer) const {

flang/test/Fir/invalid-types.fir

@@ -159,10 +159,8 @@ func.func private @upe() -> !fir.class<!fir.box<i32>>
 
 // -----
 
-// TODO: why are source locations lost on the error message?
-// the error message is printed but without a proper source location.
-// expected-error <skipme> @+1 {{invalid element type}}
-// func.func private @upe() -> !fir.box<!fir.class<none>>
+// expected-error@+1 {{invalid element type}}
+func.func private @upe() -> !fir.box<!fir.class<none>>
 
 // -----