Clean up adding type metadata for potential indirect targets.

Author: Prabhuk

clang/lib/CodeGen/CodeGenModule.cpp

@@ -2848,17 +2848,13 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
       // Skip available_externally functions. They won't be codegen'ed in the
       // current module anyway.
       if (getContext().GetGVALinkageForFunction(FD) != GVA_AvailableExternally)
-        createFunctionTypeMetadataForIcallForCFI(FD, F);
+        createFunctionTypeMetadataForIcall(FD, F);
     }
   }
 
   if (CodeGenOpts.CallGraphSection) {
-    if (auto *FD = dyn_cast<FunctionDecl>(D)) {
-      // Skip available_externally functions. They won't be codegen'ed in the
-      // current module anyway.
-      if (getContext().GetGVALinkageForFunction(FD) != GVA_AvailableExternally)
-        createFunctionTypeMDForIcallForCallGraph(FD, F);
-    }
+    if (auto *FD = dyn_cast<FunctionDecl>(D))
+      createIndirectFunctionTypeMD(FD, F);
   }
 
   // Emit type metadata on member functions for member function pointer checks.
@@ -3069,22 +3065,22 @@ static bool hasExistingGeneralizedTypeMD(llvm::Function *F) {
   return MD && MD->hasGeneralizedMDString();
 }
 
-void CodeGenModule::createFunctionTypeMDForIcallForCallGraph(
-    const FunctionDecl *FD, llvm::Function *F) {
-  // Add additional metadata if we are emitting call graph section
-  if (!CodeGenOpts.CallGraphSection)
+void CodeGenModule::createIndirectFunctionTypeMD(const FunctionDecl *FD,
+                                                 llvm::Function *F) {
+  // Return if generalized type metadata is already attached.
+  if (hasExistingGeneralizedTypeMD(F))
     return;
-
-  if (!hasExistingGeneralizedTypeMD(F) &&
-      (!F->hasLocalLinkage() ||
-       F->getFunction().hasAddressTaken(nullptr, /*IgnoreCallbackUses=*/true,
-                                        /*IgnoreAssumeLikeCalls=*/true,
-                                        /*IgnoreLLVMUsed=*/false)))
+  // All functions which are not internal linkage could be indirect targets.
+  // Address taken functions with internal linkage could be indirect targets.
+  if (!F->hasLocalLinkage() &&
+      F->getFunction().hasAddressTaken(nullptr, /*IgnoreCallbackUses=*/true,
+                                       /*IgnoreAssumeLikeCalls=*/true,
+                                       /*IgnoreLLVMUsed=*/false))
     F->addTypeMetadata(0, CreateMetadataIdentifierGeneralized(FD->getType()));
 }
 
-void CodeGenModule::createFunctionTypeMetadataForIcallForCFI(
-    const FunctionDecl *FD, llvm::Function *F) {
+void CodeGenModule::createFunctionTypeMetadataForIcall(const FunctionDecl *FD,
+                                                       llvm::Function *F) {
 
   // Only if we are checking indirect calls.
   if (!LangOpts.Sanitize.has(SanitizerKind::CFIICall))
@@ -3260,7 +3256,7 @@ void CodeGenModule::SetFunctionAttributes(GlobalDecl GD, llvm::Function *F,
   // jump table.
   if (!CodeGenOpts.SanitizeCfiCrossDso ||
       !CodeGenOpts.SanitizeCfiCanonicalJumpTables)
-    createFunctionTypeMetadataForIcallForCFI(FD, F);
+    createFunctionTypeMetadataForIcall(FD, F);
 
   if (LangOpts.Sanitize.has(SanitizerKind::KCFI))
     setKCFIType(FD, F);

clang/lib/CodeGen/CodeGenModule.h

@@ -1641,13 +1641,12 @@ class CodeGenModule : public CodeGenTypeCache {
   llvm::Metadata *CreateMetadataIdentifierGeneralized(QualType T);
 
   /// Create and attach type metadata to the given function.
-  void createFunctionTypeMetadataForIcallForCFI(const FunctionDecl *FD,
-                                                llvm::Function *F);
+  void createFunctionTypeMetadataForIcall(const FunctionDecl *FD,
+                                          llvm::Function *F);
 
   /// Create and attach type metadata if the function is a potential indirect
   /// call target to support call graph section.
-  void createFunctionTypeMDForIcallForCallGraph(const FunctionDecl *FD,
-                                                llvm::Function *F);
+  void createIndirectFunctionTypeMD(const FunctionDecl *FD, llvm::Function *F);
 
   /// Create and attach type metadata to the given call.
   void createCalleeTypeMetadataForIcall(const QualType &QT, llvm::CallBase *CB);