Merge pull request #21467 from jketema/jketema/swift-linux

jketema · web-flow · commit d5f667e585fa · 2026-03-12T22:42:51.000+01:00
Swift: Disable stack protector pass
diff --git a/swift/extractor/main.cpp b/swift/extractor/main.cpp
@@ -76,11 +76,12 @@ static void processFrontendOptions(codeql::SwiftExtractorState& state,
   }
 }
 
-static void turnOffSilVerifications(swift::SILOptions& options) {
+static void turnOffSilVerificationsAndStackProtection(swift::SILOptions& options) {
   options.VerifyAll = false;
   options.VerifyExclusivity = false;
   options.VerifyNone = true;
   options.VerifySILOwnership = false;
+  options.EnableStackProtection = false;  // Causes crashes on Linux
 }
 
 codeql::TrapDomain invocationTrapDomain(codeql::SwiftExtractorState& state);
@@ -98,7 +99,7 @@ class Observer : public swift::FrontendObserver {
     options.KeepASTContext = true;
     lockOutputSwiftModuleTraps(state, options);
     processFrontendOptions(state, options);
-    turnOffSilVerifications(invocation.getSILOptions());
+    turnOffSilVerificationsAndStackProtection(invocation.getSILOptions());
   }
 
   void configuredCompiler(swift::CompilerInstance& instance) override {

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,12 @@ static void processFrontendOptions(codeql::SwiftExtractorState& state,`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`-static void turnOffSilVerifications(swift::SILOptions& options) {`
	`79`	`+static void turnOffSilVerificationsAndStackProtection(swift::SILOptions& options) {`
`80`	`80`	`options.VerifyAll = false;`
`81`	`81`	`options.VerifyExclusivity = false;`
`82`	`82`	`options.VerifyNone = true;`
`83`	`83`	`options.VerifySILOwnership = false;`
	`84`	`+ options.EnableStackProtection = false; // Causes crashes on Linux`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`codeql::TrapDomain invocationTrapDomain(codeql::SwiftExtractorState& state);`
`@@ -98,7 +99,7 @@ class Observer : public swift::FrontendObserver {`
`98`	`99`	`options.KeepASTContext = true;`
`99`	`100`	`lockOutputSwiftModuleTraps(state, options);`
`100`	`101`	`processFrontendOptions(state, options);`
`101`		`- turnOffSilVerifications(invocation.getSILOptions());`
	`102`	`+ turnOffSilVerificationsAndStackProtection(invocation.getSILOptions());`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`void configuredCompiler(swift::CompilerInstance& instance) override {`