Skip to content

gen: fix control-flow protection attribute marking #4828

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
kinke merged 2 commits into from
Jan 23, 2025
Merged

gen: fix control-flow protection attribute marking #4828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7f0fc4
gen/modules.cpp: use setModuleFlag API to replace ...
liushuyu Jan 23, 2025
b8a9e9e
changelog for gen/module.cpp cf-protection fix
liushuyu Jan 23, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#### Platform support

#### Bug fixes
- Building multi-file D applications with control-flow protection will no longer cause LDC to throw an internal compiler error. (#4828)

# LDC 1.40.0 (2024-12-15)

Expand Down
7 changes: 5 additions & 2 deletions gen/modules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,15 +391,18 @@ void registerModuleInfo(Module *m) {

void addModuleFlags(llvm::Module &m) {
const auto ModuleMinFlag = llvm::Module::Min;
const auto ConstantOne =
llvm::ConstantInt::get(LLType::getInt32Ty(m.getContext()), 1);
const auto ConstantOneMetadata = llvm::ConstantAsMetadata::get(ConstantOne);

if (opts::fCFProtection == opts::CFProtectionType::Return ||
opts::fCFProtection == opts::CFProtectionType::Full) {
m.addModuleFlag(ModuleMinFlag, "cf-protection-return", 1);
m.setModuleFlag(ModuleMinFlag, "cf-protection-return", ConstantOneMetadata);
}

if (opts::fCFProtection == opts::CFProtectionType::Branch ||
opts::fCFProtection == opts::CFProtectionType::Full) {
m.addModuleFlag(ModuleMinFlag, "cf-protection-branch", 1);
m.setModuleFlag(ModuleMinFlag, "cf-protection-branch", ConstantOneMetadata);
}
}

Expand Down
Loading