maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix Flang build after MLIR API changes around `generatedTypeParser`

This commit is contained in:
Mehdi Amini 2021-03-09 23:13:38 +00:00
parent cf371573b0
commit 890afad954
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flang/lib/Optimizer/Dialect/FIRType.cpp
View File

@ -112,10 +112,16 @@ RecordType verifyDerived(mlir::DialectAsmParser &parser, RecordType derivedTy,
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 {

6
mlir/tools/mlir-tblgen/AttrOrTypeDefGen.cpp
View File

@ -412,7 +412,7 @@ void DefGenerator::emitTypeDefList(ArrayRef<AttrOrTypeDef> defs) {
/// {0}: The name of the base value type, e.g. Attribute or Type.
/// {1}: Additional parser parameters.
static const char *const defParserDispatchStartStr = R"(
static OptionalParseResult generated{0}Parser(::mlir::MLIRContext *context,
static ::mlir::OptionalParseResult generated{0}Parser(::mlir::MLIRContext *context,
::mlir::DialectAsmParser &parser,
::llvm::StringRef mnemonic{1},
::mlir::{0} &value) {{
@ -813,12 +813,12 @@ void DefGenerator::emitParsePrintDispatch(ArrayRef<AttrOrTypeDef> defs) {
// If the def has no parameters and no parser code, just invoke a normal
// `get`.
if (def.getNumParameters() == 0 && !def.getParserCode()) {
os << "get(context);\n return success(!!value);\n }\n";
os << "get(context);\n return ::mlir::success(!!value);\n }\n";
continue;
}
os << "parse(context, parser" << (isAttrGenerator ? ", type" : "")
<< ");\n return success(!!value);\n }\n";
<< ");\n return ::mlir::success(!!value);\n }\n";
}
}
os << " return {};\n";