shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source 
For #158193
This commit is contained in:
Vitaly Buka 2025-09-12 16:38:21 -07:00 committed by GitHub
parent bac9e463b1
commit 8ac67aa8a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -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)
@ -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);
}
@ -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.