Skip to content
Closed
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
3 changes: 2 additions & 1 deletion clang/include/clang/CIR/Dialect/IR/CIROps.td
Original file line number Diff line number Diff line change
Expand Up @@ -2521,7 +2521,8 @@ def CIR_FuncOp : CIR_Op<"func", [
OptionalAttr<DictArrayAttr>:$res_attrs,
OptionalAttr<FlatSymbolRefAttr>:$aliasee,
CIR_OptionalPriorityAttr:$global_ctor_priority,
CIR_OptionalPriorityAttr:$global_dtor_priority);
CIR_OptionalPriorityAttr:$global_dtor_priority,
OptionalAttr<CIR_InlineAttr>:$inlining);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are the differences between $inlining and $inline_kind?


let regions = (region AnyRegion:$body);

Expand Down
17 changes: 17 additions & 0 deletions clang/lib/CIR/CodeGen/CIRGenModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,23 @@ void CIRGenModule::setFunctionAttributes(GlobalDecl globalDecl,
"available body!");
assert(!cir::MissingFeatures::attributeNoBuiltin());
}

// Handle inline-related attributes (noinline, always_inline, inline hint)
// Check for explicit noinline attribute - this takes highest precedence
if (fd->hasAttr<NoInlineAttr>()) {
func.setInliningAttr(cir::InlineAttr::get(
builder.getContext(), cir::InlineKind::NoInline));
}
// Check for explicit always_inline attribute
else if (fd->hasAttr<AlwaysInlineAttr>()) {
func.setInliningAttr(cir::InlineAttr::get(
builder.getContext(), cir::InlineKind::AlwaysInline));
}
// Check for inline keyword (provides inline hint)
else if (fd->isInlined()) {
func.setInliningAttr(cir::InlineAttr::get(
builder.getContext(), cir::InlineKind::InlineHint));
}
}

void CIRGenModule::setCIRFunctionAttributesForDefinition(
Expand Down
10 changes: 5 additions & 5 deletions clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@ void CIRToLLVMFuncOpLowering::lowerFuncAttributes(
attr.getName() == getLinkageAttrNameString() ||
attr.getName() == func.getGlobalVisibilityAttrName() ||
attr.getName() == func.getDsoLocalAttrName() ||
attr.getName() == func.getInlineKindAttrName() ||
attr.getName() == func.getInliningAttrName() ||
(filterArgAndResAttrs &&
(attr.getName() == func.getArgAttrsAttrName() ||
attr.getName() == func.getResAttrsAttrName())))
Expand Down Expand Up @@ -1885,10 +1885,10 @@ mlir::LogicalResult CIRToLLVMFuncOpLowering::matchAndRewrite(

assert(!cir::MissingFeatures::opFuncMultipleReturnVals());

if (auto inlineKind = op.getInlineKind()) {
fn.setNoInline(inlineKind == cir::InlineKind::NoInline);
fn.setInlineHint(inlineKind == cir::InlineKind::InlineHint);
fn.setAlwaysInline(inlineKind == cir::InlineKind::AlwaysInline);
if (auto inlining = op.getInlining()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (auto inlining = op.getInlining()) {
if (std::optional<cir::InlineKind> inlining = op.getInlining()) {

fn.setNoInline(*inlining == cir::InlineKind::NoInline);
fn.setInlineHint(*inlining == cir::InlineKind::InlineHint);
fn.setAlwaysInline(*inlining == cir::InlineKind::AlwaysInline);
}

fn.setVisibility_Attr(mlir::LLVM::VisibilityAttr::get(
Expand Down