OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[flang][fir] Fix Werror build failure after D96422

This commit is contained in:
Valentin Clement 2021-02-10 21:42:50 -05:00 committed by clementval
parent 2407eb08a5
commit 5ad416ca78
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,11 +115,6 @@ fir::ComplexType parseComplex(mlir::DialectAsmParser &parser) {
return parseKindSingleton<fir::ComplexType>(parser); return parseKindSingleton<fir::ComplexType>(parser);
} }
// `shapeshift` `<` rank `>`
ShapeShiftType parseShapeShift(mlir::DialectAsmParser &parser) {
return parseRankSingleton<ShapeShiftType>(parser);
}
// `slice` `<` rank `>` // `slice` `<` rank `>`
SliceType parseSlice(mlir::DialectAsmParser &parser) { SliceType parseSlice(mlir::DialectAsmParser &parser) {
return parseRankSingleton<SliceType>(parser); return parseRankSingleton<SliceType>(parser);
@ -386,10 +381,9 @@ mlir::Type fir::parseFirType(FIROpsDialect *dialect,
if (typeNameLit == "ref") if (typeNameLit == "ref")
return parseReference(parser, loc); return parseReference(parser, loc);
if (typeNameLit == "shape") if (typeNameLit == "shape")
// TODO move to generatedTypeParser when all types have been moved return generatedTypeParser(dialect->getContext(), parser, typeNameLit);
return ShapeType::parse(dialect->getContext(), parser);
if (typeNameLit == "shapeshift") if (typeNameLit == "shapeshift")
return ShapeShiftType::parse(dialect->getContext(), parser); return generatedTypeParser(dialect->getContext(), parser, typeNameLit);
if (typeNameLit == "slice") if (typeNameLit == "slice")
return parseSlice(parser); return parseSlice(parser);
if (typeNameLit == "tdesc") if (typeNameLit == "tdesc")
@ -1414,16 +1408,6 @@ void fir::printFirType(FIROpsDialect *, mlir::Type ty,
os << '>'; os << '>';
return; return;
} }
if (auto type = ty.dyn_cast<ShapeType>()) {
// TODO when all type are moved to TableGen can be replaced by
// generatedTypePrinter
type.print(p);
return;
}
if (auto type = ty.dyn_cast<ShapeShiftType>()) {
type.print(p);
return;
}
if (auto type = ty.dyn_cast<SliceType>()) { if (auto type = ty.dyn_cast<SliceType>()) {
os << "slice<" << type.getRank() << '>'; os << "slice<" << type.getRank() << '>';
return; return;
@ -1497,6 +1481,10 @@ void fir::printFirType(FIROpsDialect *, mlir::Type ty,
os << '>'; os << '>';
return; return;
} }
if (mlir::succeeded(generatedTypePrinter(ty, p))) {
return;
}
} }
bool fir::isa_unknown_size_box(mlir::Type t) { bool fir::isa_unknown_size_box(mlir::Type t) {