Skip to content

[NFC][CFI][CodeGen] Move GeneralizeFunctionType out of CreateMetadataIdentifierGeneralized #158190

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 8 commits into from
Sep 12, 2025
Merged

[NFC][CFI][CodeGen] Move GeneralizeFunctionType out of CreateMetadataIdentifierGeneralized #158190

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f34bbf
[𝘀𝗽𝗿] changes to main this commit is based on
vitalybuka Sep 12, 2025
8b00c31
[𝘀𝗽𝗿] initial version
vitalybuka Sep 12, 2025
44a9a0b
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Sep 12, 2025
82c1131
newline
vitalybuka Sep 12, 2025
d27f845
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Sep 12, 2025
e493b01
rebase
vitalybuka Sep 12, 2025
e9f7172
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Sep 12, 2025
bbc6c94
rebase
vitalybuka Sep 12, 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
15 changes: 10 additions & 5 deletions clang/lib/CodeGen/CodeGenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3041,9 +3041,12 @@ void CodeGenModule::createFunctionTypeMetadataForIcall(const FunctionDecl *FD,
if (isa<CXXMethodDecl>(FD) && !cast<CXXMethodDecl>(FD)->isStatic())
return;

llvm::Metadata *MD = CreateMetadataIdentifierForType(FD->getType());
QualType FnType = FD->getType();
llvm::Metadata *MD = CreateMetadataIdentifierForType(FnType);
F->addTypeMetadata(0, MD);
F->addTypeMetadata(0, CreateMetadataIdentifierGeneralized(FD->getType()));

QualType GenPtrFnType = GeneralizeFunctionType(getContext(), FD->getType());
F->addTypeMetadata(0, CreateMetadataIdentifierGeneralized(GenPtrFnType));

// Emit a hash-based bit set entry for cross-DSO calls.
if (CodeGenOpts.SanitizeCfiCrossDso)
Expand Down Expand Up @@ -7936,8 +7939,10 @@ CodeGenModule::CreateMetadataIdentifierImpl(QualType T, MetadataTypeMap &Map,

llvm::Metadata *CodeGenModule::CreateMetadataIdentifierForFnType(QualType T) {
assert(isa<FunctionType>(T));
if (getCodeGenOpts().SanitizeCfiICallGeneralizePointers)
if (getCodeGenOpts().SanitizeCfiICallGeneralizePointers) {
T = GeneralizeFunctionType(getContext(), T);
return CreateMetadataIdentifierGeneralized(T);
}
return CreateMetadataIdentifierForType(T);
}

Expand All @@ -7951,8 +7956,8 @@ CodeGenModule::CreateMetadataIdentifierForVirtualMemPtrType(QualType T) {
}

llvm::Metadata *CodeGenModule::CreateMetadataIdentifierGeneralized(QualType T) {
return CreateMetadataIdentifierImpl(GeneralizeFunctionType(getContext(), T),
GeneralizedMetadataIdMap, ".generalized");
return CreateMetadataIdentifierImpl(T, GeneralizedMetadataIdMap,
".generalized");
}

/// Returns whether this module needs the "all-vtables" type identifier.
Expand Down
Loading