commit bbce11f86e1bd7648ac0b623970dbb095fc52443
author Mehdi Amini <joker.eph@gmail.com> Tue Mar 09 23:13:38 2021 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Mar 18 00:17:59 2021 -0700
tree c88a59fc46c41a3c6c68aeef4286aef575fcfc88
parent 5bc10ad33547e422cd2f3c78a30913cce8321f04

Fix Flang build after MLIR API changes around `generatedTypeParser`

GitOrigin-RevId: 890afad954d60aa91a27fa5ef0689e1d53aad7b4

lib/Optimizer/Dialect/FIRType.cpp

diff --git a/lib/Optimizer/Dialect/FIRType.cpp b/lib/Optimizer/Dialect/FIRType.cpp
index eb347a9..873f589 100644
--- a/lib/Optimizer/Dialect/FIRType.cpp
+++ b/lib/Optimizer/Dialect/FIRType.cpp
@@ -112,10 +112,16 @@
 
 mlir::Type fir::parseFirType(FIROpsDialect *dialect,
                              mlir::DialectAsmParser &parser) {
-  llvm::StringRef typeNameLit;
-  if (mlir::failed(parser.parseKeyword(&typeNameLit)))
+  mlir::StringRef typeTag;
+  if (parser.parseKeyword(&typeTag))
     return {};
-  return generatedTypeParser(dialect->getContext(), parser, typeNameLit);
+  mlir::Type genType;
+  auto parseResult = generatedTypeParser(parser.getBuilder().getContext(),
+                                         parser, typeTag, genType);
+  if (parseResult.hasValue())
+    return genType;
+  parser.emitError(parser.getNameLoc(), "unknown fir type: ") << typeTag;
+  return {};
 }
 
 namespace fir {