Merge remote-tracking branch 'origin/main' into rebranch

Trivial conflict caused by the line above the
`IGM.constructInitialFnAttributes` change in `lib/IRGen/GenDecl.cpp`
having an extra argument passed in rebranch (due to the new LLVM API).

lib/Frontend/CompilerInvocation.cpp

@@ -2406,6 +2406,10 @@ 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;
 }