Skip to content

Mark CXX module initializer with PACBTI attributes #133716

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
merged 5 commits into from
Apr 25, 2025
Merged

Mark CXX module initializer with PACBTI attributes #133716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb64966
Mark CXX module initializer with PACBTI attributes
vhscampos Mar 28, 2025
6d23613
- Change patch to use existing function.
vhscampos Apr 4, 2025
968bbfb
Extend new solution to AArch64
vhscampos Apr 4, 2025
67d6147
Change the place where `setTargetAttributes` is called
vhscampos Apr 7, 2025
4006de2
- Call extra functions to initialise function
vhscampos Apr 8, 2025
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
5 changes: 5 additions & 0 deletions clang/lib/CodeGen/CGDeclCXX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,11 @@ llvm::Function *CodeGenModule::CreateGlobalInitOrCleanUpFunction(

if (Linkage == llvm::GlobalVariable::InternalLinkage)
SetInternalFunctionAttributes(GlobalDecl(), Fn, FI);
else {
SetLLVMFunctionAttributes(GlobalDecl(), FI, Fn, false);
SetLLVMFunctionAttributesForDefinition(nullptr, Fn);
getTargetCodeGenInfo().setTargetAttributes(nullptr, Fn, *this);
}

Fn->setCallingConv(getRuntimeCC());

Expand Down
9 changes: 5 additions & 4 deletions clang/lib/CodeGen/Targets/AArch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,15 @@ class AArch64TargetCodeGenInfo : public TargetCodeGenInfo {

void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV,
CodeGen::CodeGenModule &CGM) const override {
const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D);
if (!FD)
auto *Fn = dyn_cast<llvm::Function>(GV);
if (!Fn)
return;

const auto *FD = dyn_cast_or_null<FunctionDecl>(D);
TargetInfo::BranchProtectionInfo BPI(CGM.getLangOpts());

if (const auto *TA = FD->getAttr<TargetAttr>()) {
if (FD && FD->hasAttr<TargetAttr>()) {
const auto *TA = FD->getAttr<TargetAttr>();
ParsedTargetAttr Attr =
CGM.getTarget().parseTargetAttr(TA->getFeaturesStr());
if (!Attr.BranchProtection.empty()) {
Expand All @@ -152,7 +154,6 @@ class AArch64TargetCodeGenInfo : public TargetCodeGenInfo {
assert(Error.empty());
}
}
auto *Fn = cast<llvm::Function>(GV);
setBranchProtectionFnAttributes(BPI, *Fn);
}

Expand Down
15 changes: 7 additions & 8 deletions clang/lib/CodeGen/Targets/ARM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,13 @@ class ARMTargetCodeGenInfo : public TargetCodeGenInfo {

void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV,
CodeGen::CodeGenModule &CGM) const override {
if (GV->isDeclaration())
auto *Fn = dyn_cast<llvm::Function>(GV);
if (!Fn)
return;
const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D);
if (!FD)
return;
auto *Fn = cast<llvm::Function>(GV);
const auto *FD = dyn_cast_or_null<FunctionDecl>(D);

if (const auto *TA = FD->getAttr<TargetAttr>()) {
if (FD && FD->hasAttr<TargetAttr>()) {
const auto *TA = FD->getAttr<TargetAttr>();
ParsedTargetAttr Attr =
CGM.getTarget().parseTargetAttr(TA->getFeaturesStr());
if (!Attr.BranchProtection.empty()) {
Expand Down Expand Up @@ -174,10 +173,10 @@ class ARMTargetCodeGenInfo : public TargetCodeGenInfo {
setBranchProtectionFnAttributes(BPI, (*Fn));
}

const ARMInterruptAttr *Attr = FD->getAttr<ARMInterruptAttr>();
if (!Attr)
if (!FD || !FD->hasAttr<ARMInterruptAttr>())
return;

const ARMInterruptAttr *Attr = FD->getAttr<ARMInterruptAttr>();
const char *Kind;
switch (Attr->getInterrupt()) {
case ARMInterruptAttr::Generic: Kind = ""; break;
Expand Down
17 changes: 17 additions & 0 deletions clang/test/CodeGenCXX/cxx20-module-initializer-pacbti.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// RUN: %clang_cc1 -triple thumbv8.1m.main-unknown-none-eabi -emit-module-interface -target-feature +pacbti -msign-return-address=all -mbranch-target-enforce -std=c++20 %s -o %t.pcm
// RUN: %clang_cc1 -triple thumbv8.1m.main-unknown-none-eabi -std=c++20 %t.pcm -emit-llvm -o - | \
// RUN: FileCheck --check-prefixes=CHECK,CHECK-PAC-ARM %s

// RUN: %clang_cc1 -triple aarch64-unknown-none-elf -emit-module-interface -target-feature +pacbti -msign-return-address=all -msign-return-address-key=b_key -mbranch-target-enforce -std=c++20 %s -o %t.pcm
// RUN: %clang_cc1 -triple aarch64-unknown-none-elf -std=c++20 %t.pcm -emit-llvm -o - | \
// RUN: FileCheck --check-prefixes=CHECK,CHECK-PAC-AARCH64 %s

// CHECK: define void @_ZGIW3foo() #0
// CHECK-PAC-ARM: attributes #0 = { noinline nounwind "branch-target-enforcement" "no-trapping-math"="true" "sign-return-address"="all" "sign-return-address-key"="a_key" "stack-protector-buffer-size"="8" "target-features"="+armv8.1-m.main,+pacbti,+thumb-mode" }
// CHECK-PAC-AARCH64: attributes #0 = { noinline nounwind "branch-target-enforcement" "no-trapping-math"="true" "sign-return-address"="all" "sign-return-address-key"="b_key" "stack-protector-buffer-size"="8" "target-features"="+pacbti" }

module;

export module foo;

export void func();