Merge pull request swiftlang#34033 from eeckstein/merge-func-ptrauth

LLVM-Passes: add pointer authentication to Swift's function merge pass.

Author: eeckstein

include/swift/LLVMPasses/PassesFwd.h

@@ -31,7 +31,8 @@ namespace swift {
   llvm::FunctionPass *createSwiftARCOptPass();
   llvm::FunctionPass *createSwiftARCContractPass();
   llvm::ModulePass *createInlineTreePrinterPass();
-  llvm::ModulePass *createSwiftMergeFunctionsPass();
+  llvm::ModulePass *createSwiftMergeFunctionsPass(bool ptrAuthEnabled,
+                                                  unsigned ptrAuthKey);
   llvm::ImmutablePass *createSwiftAAWrapperPass();
   llvm::ImmutablePass *createSwiftRCIdentityPass();
 } // end namespace swift

lib/IRGen/IRGen.cpp

@@ -126,12 +126,6 @@ static void addSwiftContractPass(const PassManagerBuilder &Builder,
     PM.add(createSwiftARCContractPass());
 }
 
-static void addSwiftMergeFunctionsPass(const PassManagerBuilder &Builder,
-                                       PassManagerBase &PM) {
-  if (Builder.OptLevel > 0)
-    PM.add(createSwiftMergeFunctionsPass());
-}
-
 static void addAddressSanitizerPasses(const PassManagerBuilder &Builder,
                                       legacy::PassManagerBase &PM) {
   auto &BuilderWrapper =
@@ -249,9 +243,16 @@ void swift::performLLVMOptimizations(const IRGenOptions &Opts,
     PMBuilder.addExtension(PassManagerBuilder::EP_EnabledOnOptLevel0,
                            addSanitizerCoveragePass);
   }
-  if (RunSwiftSpecificLLVMOptzns)
+  if (RunSwiftSpecificLLVMOptzns) {
     PMBuilder.addExtension(PassManagerBuilder::EP_OptimizerLast,
-                           addSwiftMergeFunctionsPass);
+      [&](const PassManagerBuilder &Builder, PassManagerBase &PM) {
+        if (Builder.OptLevel > 0) {
+          const PointerAuthSchema &schema = Opts.PointerAuth.FunctionPointers;
+          unsigned key = (schema.isEnabled() ? schema.getKey() : 0);
+          PM.add(createSwiftMergeFunctionsPass(schema.isEnabled(), key));
+        }
+      });
+  }
 
   // Configure the function passes.
   legacy::FunctionPassManager FunctionPasses(Module);