diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.td b/flang/include/flang/Optimizer/Dialect/FIROps.td index d1308df3fb962..29bd100164b79 100644 --- a/flang/include/flang/Optimizer/Dialect/FIROps.td +++ b/flang/include/flang/Optimizer/Dialect/FIROps.td @@ -2433,7 +2433,6 @@ def fir_DispatchOp : fir_Op<"dispatch", []> { // operand[0] is the object (of class type) operand_iterator arg_operand_begin() { return operand_begin() + 1; } operand_iterator arg_operand_end() { return operand_end(); } - static constexpr llvm::StringRef getMethodAttrNameStr() { return "method"; } }]; } @@ -2922,7 +2921,6 @@ def fir_DTEntryOp : fir_Op<"dt_entry", [HasParent<"TypeInfoOp">]> { let hasCustomAssemblyFormat = 1; let extraClassDeclaration = [{ - static constexpr llvm::StringRef getMethodAttrNameStr() { return "method"; } static constexpr llvm::StringRef getProcAttrNameStr() { return "proc"; } }]; } diff --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp index 447d56d822a3e..0a534cdb3c487 100644 --- a/flang/lib/Optimizer/Dialect/FIROps.cpp +++ b/flang/lib/Optimizer/Dialect/FIROps.cpp @@ -2289,12 +2289,11 @@ mlir::ParseResult fir::DTEntryOp::parse(mlir::OpAsmParser &parser, // allow `methodName` or `"methodName"` if (failed(parser.parseOptionalKeyword(&methodName))) { mlir::StringAttr methodAttr; - if (parser.parseAttribute(methodAttr, - fir::DTEntryOp::getMethodAttrNameStr(), + if (parser.parseAttribute(methodAttr, getMethodAttrName(result.name), result.attributes)) return mlir::failure(); } else { - result.addAttribute(fir::DTEntryOp::getMethodAttrNameStr(), + result.addAttribute(getMethodAttrName(result.name), parser.getBuilder().getStringAttr(methodName)); } mlir::SymbolRefAttr calleeAttr;