IRGen: move the EnableStackProtector option from IRGenOptions to SILOptions.

... because we need it in the SIL pass pipeline, too.
Also, add Swift bridging for that option.

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/PassManager/Options.swift

@@ -14,4 +14,8 @@ import OptimizerBridging
 
 struct Options {
   let _bridged: BridgedPassContext
+
+  var enableStackProtection: Bool {
+    SILOptions_enableStackProtection(_bridged) != 0
+  }
 }

include/swift/AST/IRGenOptions.h

@@ -94,8 +94,6 @@ enum class ReflectionMetadataMode : unsigned {
   Runtime,      ///< Make reflection metadata fully available.
 };
 
-enum class StackProtectorMode : bool { NoStackProtector, StackProtector };
-
 using clang::PointerAuthSchema;
 
 struct PointerAuthOptions : clang::PointerAuthOptions {
@@ -285,8 +283,6 @@ class IRGenOptions {
   /// Whether we should run swift specific LLVM optimizations after IRGen.
   unsigned DisableSwiftSpecificLLVMOptzns : 1;
 
-  unsigned EnableStackProtector : 1;
-
   /// Special codegen for playgrounds.
   unsigned Playground : 1;
 
@@ -464,7 +460,7 @@ class IRGenOptions {
         DebugInfoFormat(IRGenDebugInfoFormat::None),
         DisableClangModuleSkeletonCUs(false), UseJIT(false),
         DisableLLVMOptzns(false), DisableSwiftSpecificLLVMOptzns(false),
-        EnableStackProtector(false), Playground(false),
+        Playground(false),
         EmitStackPromotionChecks(false), UseSingleModuleLLVMEmission(false),
         FunctionSections(false), PrintInlineTree(false),
         EmbedMode(IRGenEmbedMode::None), LLVMLTOKind(IRGenLLVMLTOKind::None),
@@ -550,9 +546,6 @@ class IRGenOptions {
   bool hasMultipleIRGenThreads() const { return !UseSingleModuleLLVMEmission && NumThreads > 1; }
   bool shouldPerformIRGenerationInParallel() const { return !UseSingleModuleLLVMEmission && NumThreads != 0; }
   bool hasMultipleIGMs() const { return hasMultipleIRGenThreads(); }
-  StackProtectorMode getStackProtectorMode() const {
-    return StackProtectorMode(EnableStackProtector);
-  }
 };
 
 } // end namespace swift

include/swift/AST/SILOptions.h

@@ -128,6 +128,9 @@ class SILOptions {
   /// Enables experimental performance annotations.
   bool EnablePerformanceAnnotations = false;
 
+  /// Enables the emission of stack protectors in functions.
+  bool EnableStackProtection = false;
+
   /// Controls whether or not paranoid verification checks are run.
   bool VerifyAll = false;
 

include/swift/SILOptimizer/OptimizerBridging.h

@@ -184,6 +184,8 @@ PassContext_nextDefaultWitnessTableInModule(BridgedDefaultWitnessTable table);
 OptionalBridgedFunction
 PassContext_loadFunction(BridgedPassContext context, llvm::StringRef name);
 
+SwiftInt SILOptions_enableStackProtection(BridgedPassContext context);
+
 SWIFT_END_NULLABILITY_ANNOTATIONS
 
 #endif

lib/Frontend/CompilerInvocation.cpp

@@ -1762,6 +1762,9 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
   }
   Opts.EnablePerformanceAnnotations |=
       Args.hasArg(OPT_ExperimentalPerformanceAnnotations);
+  Opts.EnableStackProtection =
+      Args.hasFlag(OPT_enable_stack_protector, OPT_disable_stack_protector,
+                   Opts.EnableStackProtection);
   Opts.VerifyAll |= Args.hasArg(OPT_sil_verify_all);
   Opts.VerifyNone |= Args.hasArg(OPT_sil_verify_none);
   Opts.DebugSerialization |= Args.hasArg(OPT_sil_debug_serialization);
@@ -2410,10 +2413,6 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
                    OPT_enable_new_llvm_pass_manager,
                    Opts.LegacyPassManager);
 
-  Opts.EnableStackProtector =
-      Args.hasFlag(OPT_enable_stack_protector, OPT_disable_stack_protector,
-                   Opts.EnableStackProtector);
-
   return false;
 }
 

lib/IRGen/GenDecl.cpp

@@ -3201,7 +3201,9 @@ llvm::Constant *swift::irgen::emitCXXConstructorThunkIfNeeded(
 }
 
 StackProtectorMode IRGenModule::shouldEmitStackProtector(SILFunction *f) {
-  return IRGen.Opts.getStackProtectorMode();
+  const SILOptions &opts = IRGen.SIL.getOptions();
+  return (opts.EnableStackProtection) ?
+    StackProtectorMode::StackProtector : StackProtectorMode::NoStackProtector;
 }
 
 /// Find the entry point for a SIL function.

lib/IRGen/IRGen.h

@@ -44,6 +44,8 @@ namespace irgen {
 /// store vectors of spare bits.
 using SpareBitVector = ClusteredBitVector;
 
+enum class StackProtectorMode : bool { NoStackProtector, StackProtector };
+
 class Size;
 
 enum IsPOD_t : bool { IsNotPOD, IsPOD };

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -1633,3 +1633,8 @@ PassContext_loadFunction(BridgedPassContext context, StringRef name) {
   SILFunction *f = mod->loadFunction(name, SILModule::LinkingMode::LinkNormal);
   return {f};
 }
+
+SwiftInt SILOptions_enableStackProtection(BridgedPassContext context) {
+  SILModule *mod = castToPassInvocation(context)->getPassManager()->getModule();
+  return mod->getOptions().EnableStackProtection;
+}

tools/sil-opt/SILOpt.cpp

@@ -598,6 +598,7 @@ int main(int argc, char **argv) {
   SILOpts.OptRecordPasses = RemarksPasses;
   SILOpts.checkSILModuleLeaks = true;
   SILOpts.EnablePerformanceAnnotations = true;
+  SILOpts.EnableStackProtection = true;
 
   SILOpts.VerifyExclusivity = VerifyExclusivity;
   if (EnforceExclusivity.getNumOccurrences() != 0) {