Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[ForceFunctionAttrs] Fix handling of alwaysinline and noinline attributes. #180026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinfargnoli merged 4 commits into from
Feb 9, 2026
Merged

[ForceFunctionAttrs] Fix handling of alwaysinline and noinline attributes. #180026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df93d20
[ForceFunctionAttrs] Fix handling of alwaysinline and noinline attrib…
justinfargnoli Feb 5, 2026
0087b80
Merge branch 'main' into dev/jf/upstream-force-func-attrs
justinfargnoli Feb 9, 2026
1dd642c
Merge branch 'main' into dev/jf/upstream-force-func-attrs
justinfargnoli Feb 9, 2026
aaaaca8
Merge branch 'main' into dev/jf/upstream-force-func-attrs
justinfargnoli Feb 9, 2026
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
14 changes: 12 additions & 2 deletions llvm/lib/Transforms/IPO/ForceFunctionAttrs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ static cl::opt<std::string> CSVFilePath(
"Path to CSV file containing lines of function names and attributes to "
"add to them in the form of `f1,attr1` or `f2,attr2=str`."));

static bool hasConflictingFnAttr(Attribute::AttrKind Kind, Function &F) {
if (Kind == Attribute::AlwaysInline)
return F.hasFnAttribute(Attribute::NoInline);
if (Kind == Attribute::NoInline)
return F.hasFnAttribute(Attribute::AlwaysInline);
return false;
}

/// If F has any forced attributes given on the command line, add them.
/// If F has any forced remove attributes given on the command line, remove
/// them. When both force and force-remove are given to a function, the latter
Expand All @@ -69,7 +77,8 @@ static void forceAttributes(Function &F) {

for (const auto &S : ForceAttributes) {
auto Kind = ParseFunctionAndAttr(S);
if (Kind == Attribute::None || F.hasFnAttribute(Kind))
if (Kind == Attribute::None || F.hasFnAttribute(Kind) ||
hasConflictingFnAttr(Kind, F))
continue;
F.addFnAttr(Kind);
}
Expand Down Expand Up @@ -115,7 +124,8 @@ PreservedAnalyses ForceFunctionAttrsPass::run(Module &M,
} else {
auto AttrKind = Attribute::getAttrKindFromName(SplitPair.second);
if (AttrKind != Attribute::None &&
Attribute::canUseAsFnAttr(AttrKind)) {
Attribute::canUseAsFnAttr(AttrKind) &&
!hasConflictingFnAttr(AttrKind, *Func)) {
// TODO: There could be string attributes without a value, we should
// support those, too.
Func->addFnAttr(AttrKind);
Expand Down
45 changes: 36 additions & 9 deletions llvm/test/Transforms/ForcedFunctionAttrs/forced.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
; RUN: opt < %s -S -passes=forceattrs | FileCheck %s --check-prefix=CHECK-CONTROL
; RUN: opt < %s -S -passes=forceattrs -force-attribute foo:noinline | FileCheck %s --check-prefix=CHECK-FOO
; RUN: opt < %s -S -passes=forceattrs -force-remove-attribute goo:cold | FileCheck %s --check-prefix=REMOVE-COLD
; RUN: opt < %s -S -passes=forceattrs -force-remove-attribute goo:noinline | FileCheck %s --check-prefix=REMOVE-NOINLINE
; RUN: opt < %s -S -passes=forceattrs -force-attribute goo:cold -force-remove-attribute goo:noinline | FileCheck %s --check-prefix=ADD-COLD-REMOVE-NOINLINE
; RUN: opt < %s -S -passes=forceattrs -force-attribute goo:noinline -force-remove-attribute goo:noinline | FileCheck %s --check-prefix=ADD-NOINLINE-REMOVE-NOINLINE
; RUN: opt < %s -S -passes=forceattrs -force-attribute optsize | FileCheck %s --check-prefix=CHECK-ADD-ALL
; RUN: opt < %s -S -passes=forceattrs -force-remove-attribute noinline | FileCheck %s --check-prefix=CHECK-REMOVE-ALL
; RUN: opt < %s -S -passes=verify,forceattrs,verify | FileCheck %s --check-prefix=CHECK-CONTROL
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-attribute foo:noinline | FileCheck %s --check-prefix=CHECK-FOO
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-remove-attribute goo:cold | FileCheck %s --check-prefix=REMOVE-COLD
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-remove-attribute goo:noinline | FileCheck %s --check-prefix=REMOVE-NOINLINE
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-attribute goo:cold -force-remove-attribute goo:noinline | FileCheck %s --check-prefix=ADD-COLD-REMOVE-NOINLINE
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-attribute goo:noinline -force-remove-attribute goo:noinline | FileCheck %s --check-prefix=ADD-NOINLINE-REMOVE-NOINLINE
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-attribute optsize | FileCheck %s --check-prefix=CHECK-ADD-ALL
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-remove-attribute noinline | FileCheck %s --check-prefix=CHECK-REMOVE-ALL
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-attribute alwaysinline | FileCheck %s --check-prefix=CHECK-ALWAYSINLINE-ALL
; RUN: opt < %s -S -passes=verify,forceattrs,verify -force-attribute noinline | FileCheck %s --check-prefix=CHECK-NOINLINE-ALL

; CHECK-CONTROL: define void @foo() {
; CHECK-FOO: define void @foo() #0 {
Expand All @@ -29,7 +31,13 @@ define void @foo() {
define void @goo() #0 {
ret void
}

define void @hoo() #1 {
ret void
}

attributes #0 = { noinline }
attributes #1 = { alwaysinline }

; CHECK-FOO: attributes #0 = { noinline }
; REMOVE-COLD: attributes #0 = { noinline }
Expand All @@ -39,13 +47,32 @@ attributes #0 = { noinline }
; should be added to all functions in the module.
; CHECK-ADD-ALL: define void @foo() #0 {
; CHECK-ADD-ALL: define void @goo() #1 {
; CHECK-ADD-ALL: define void @hoo() #2 {
; CHECK-ADD-ALL: attributes #0 = { optsize }
; CHECK-ADD-ALL: attributes #1 = { noinline optsize }
; CHECK-ADD-ALL: attributes #2 = { alwaysinline optsize }

; When passing an attribute to be removed without specifying a function,
; the attribute should be removed from all functions in the module that
; have it.
; CHECK-REMOVE-ALL: define void @foo() {
; CHECK-REMOVE-ALL: define void @goo() {
; CHECK-REMOVE-ALL-NOT: attributes #0
; CHECK-REMOVE-ALL: define void @hoo() #0 {
; CHECK-REMOVE-ALL: attributes #0 = { alwaysinline }

; When forcing alwaysinline on all functions, it should not be added to
; functions that already have noinline (would produce invalid IR).
; CHECK-ALWAYSINLINE-ALL: define void @foo() #0 {
; CHECK-ALWAYSINLINE-ALL: define void @goo() #1 {
; CHECK-ALWAYSINLINE-ALL: define void @hoo() #0 {
; CHECK-ALWAYSINLINE-ALL-DAG: attributes #0 = { alwaysinline }
; CHECK-ALWAYSINLINE-ALL-DAG: attributes #1 = { noinline }

; When forcing noinline on all functions, it should not be added to
; functions that already have alwaysinline (would produce invalid IR).
; CHECK-NOINLINE-ALL: define void @foo() #0 {
; CHECK-NOINLINE-ALL: define void @goo() #0 {
; CHECK-NOINLINE-ALL: define void @hoo() #1 {
; CHECK-NOINLINE-ALL-DAG: attributes #0 = { noinline }
; CHECK-NOINLINE-ALL-DAG: attributes #1 = { alwaysinline }

Loading