[NFC][CodeGen][CFI] Extract CreateMetadataIdentifierForFnType (llvm#158189)

vitalybuka · web-flow · commit bac9e463b1f7 · 2025-09-12T16:15:31.000-07:00
For llvm#158193
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
@@ -6496,11 +6496,8 @@ RValue CodeGenFunction::EmitCall(QualType CalleeType,
     SanitizerDebugLocation SanScope(this, {CheckOrdinal}, CheckHandler);
     EmitSanitizerStatReport(llvm::SanStat_CFI_ICall);
 
-    llvm::Metadata *MD;
-    if (CGM.getCodeGenOpts().SanitizeCfiICallGeneralizePointers)
-      MD = CGM.CreateMetadataIdentifierGeneralized(QualType(FnType, 0));
-    else
-      MD = CGM.CreateMetadataIdentifierForType(QualType(FnType, 0));
+    llvm::Metadata *MD =
+        CGM.CreateMetadataIdentifierForFnType(QualType(FnType, 0));
 
     llvm::Value *TypeId = llvm::MetadataAsValue::get(getLLVMContext(), MD);
 
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -7934,6 +7934,13 @@ CodeGenModule::CreateMetadataIdentifierImpl(QualType T, MetadataTypeMap &Map,
   return InternalId;
 }
 
+llvm::Metadata *CodeGenModule::CreateMetadataIdentifierForFnType(QualType T) {
+  assert(isa<FunctionType>(T));
+  if (getCodeGenOpts().SanitizeCfiICallGeneralizePointers)
+    return CreateMetadataIdentifierGeneralized(T);
+  return CreateMetadataIdentifierForType(T);
+}
+
 llvm::Metadata *CodeGenModule::CreateMetadataIdentifierForType(QualType T) {
   return CreateMetadataIdentifierImpl(T, MetadataIdMap, "");
 }
diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h
@@ -1623,6 +1623,9 @@ class CodeGenModule : public CodeGenTypeCache {
   /// Generate a KCFI type identifier for T.
   llvm::ConstantInt *CreateKCFITypeId(QualType T, StringRef Salt);
 
+  /// Create a metadata identifier for the given function type.
+  llvm::Metadata *CreateMetadataIdentifierForFnType(QualType T);
+
   /// Create a metadata identifier for the given type. This may either be an
   /// MDString (for external identifiers) or a distinct unnamed MDNode (for
   /// internal identifiers).

Original file line number	Diff line number	Diff line change
`@@ -7934,6 +7934,13 @@ CodeGenModule::CreateMetadataIdentifierImpl(QualType T, MetadataTypeMap &Map,`
`7934`	`7934`	`return InternalId;`
`7935`	`7935`	`}`
`7936`	`7936`
	`7937`	`+llvm::Metadata *CodeGenModule::CreateMetadataIdentifierForFnType(QualType T) {`
	`7938`	`+ assert(isa<FunctionType>(T));`
	`7939`	`+ if (getCodeGenOpts().SanitizeCfiICallGeneralizePointers)`
	`7940`	`+ return CreateMetadataIdentifierGeneralized(T);`
	`7941`	`+ return CreateMetadataIdentifierForType(T);`
	`7942`	`+}`
	`7943`	`+`
`7937`	`7944`	`llvm::Metadata *CodeGenModule::CreateMetadataIdentifierForType(QualType T) {`
`7938`	`7945`	`return CreateMetadataIdentifierImpl(T, MetadataIdMap, "");`
`7939`	`7946`	`}`