Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mlir/test/mlir-tblgen/op-decl-and-defs.td
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,14 @@ def NS_FOp : NS_Op<"op_with_all_types_constraint",

// DEFS: FOp FOp::create(::mlir::OpBuilder &builder, ::mlir::Location location, ::mlir::Value a) {
// DEFS: ::mlir::OperationState __state__(location, getOperationName());
// DEFS: build(builder, __state__, a);
// DEFS: build(builder, __state__, std::forward<decltype(a)>(a));
// DEFS: auto __res__ = ::llvm::dyn_cast<FOp>(builder.create(__state__));
// DEFS: assert(__res__ && "builder didn't return the right type");
// DEFS: return __res__;
// DEFS: }

// DEFS: FOp FOp::create(::mlir::ImplicitLocOpBuilder &builder, ::mlir::Value a) {
// DEFS: return create(builder, builder.getLoc(), a);
// DEFS: return create(builder, builder.getLoc(), std::forward<decltype(a)>(a));
// DEFS: }

def NS_GOp : NS_Op<"op_with_fixed_return_type", []> {
Expand Down
9 changes: 8 additions & 1 deletion mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2641,7 +2641,14 @@ void OpEmitter::genInlineCreateBody(
std::string nonBuilderStateArgs = "";
if (!nonBuilderStateArgsList.empty()) {
llvm::raw_string_ostream nonBuilderStateArgsOS(nonBuilderStateArgs);
interleaveComma(nonBuilderStateArgsList, nonBuilderStateArgsOS);
interleave(
nonBuilderStateArgsList,
[&](StringRef name) {
nonBuilderStateArgsOS << "std::forward<decltype(" << name << ")>("
<< name << ')';
},
[&] { nonBuilderStateArgsOS << ", "; });

nonBuilderStateArgs = ", " + nonBuilderStateArgs;
}
if (cWithLoc)
Expand Down