Merge pull request #2899 from swiftwasm/release/5.4

[pull] swiftwasm-release/5.4 from release/5.4

Author: pull[bot]

lib/Driver/UnixToolChains.cpp

@@ -273,6 +273,14 @@ toolchains::GenericUnix::constructInvocation(const DynamicLinkJobAction &job,
     Arguments.push_back(context.Args.MakeArgString(context.OI.SDKPath));
   }
 
+  // If we are linking statically, we need to add all
+  // dependencies to a library search group to resolve
+  // potential circular dependencies
+  if (staticExecutable || staticStdlib) {
+    Arguments.push_back("-Xlinker");
+    Arguments.push_back("--start-group");
+  }
+
   // Add any autolinking scripts to the arguments
   for (const Job *Cmd : context.Inputs) {
     auto &OutputInfo = Cmd->getOutput();
@@ -281,6 +289,11 @@ toolchains::GenericUnix::constructInvocation(const DynamicLinkJobAction &job,
           Twine("@") + OutputInfo.getPrimaryOutputFilename()));
   }
 
+  if (staticExecutable || staticStdlib) {
+    Arguments.push_back("-Xlinker");
+    Arguments.push_back("--end-group");
+  }
+
   // Add the runtime library link paths.
   for (auto path : RuntimeLibPaths) {
     Arguments.push_back("-L");

lib/SIL/IR/SILModule.cpp

@@ -167,13 +167,17 @@ void SILModule::checkForLeaks() const {
 }
 
 void SILModule::checkForLeaksAfterDestruction() {
+// Disabled in release (non-assert) builds because this check fails in rare
+// cases in lldb, causing crashes. rdar://70826934
+#ifndef NDEBUG
   int numAllocated = SILInstruction::getNumCreatedInstructions() -
                      SILInstruction::getNumDeletedInstructions();
 
   if (numAllocated != 0) {
     llvm::errs() << "Leaking " << numAllocated << " instructions!\n";
     llvm_unreachable("leaking instructions");
   }
+#endif
 }
 
 std::unique_ptr<SILModule> SILModule::createEmptyModule(

test/Driver/linker-args-order-linux.swift

@@ -6,4 +6,4 @@ print("hello world!")
 // RUN: %target-swiftc_driver -driver-print-jobs -static-stdlib -o %t/static-stdlib %s -Xlinker --no-allow-multiple-definition 2>&1| %FileCheck %s
 // CHECK: {{.*}}/swift-frontend -frontend -c -primary-file {{.*}}/linker-args-order-linux.swift
 // CHECK: {{.*}}/swift-autolink-extract{{.*}}
-// CHECK: {{.*}}swiftrt.o /{{.*}}/linker-args-order-linux-{{[a-z0-9]+}}.o @/{{.*}}/linker-args-order-linux-{{[a-z0-9]+}}.autolink {{.*}} @{{.*}}/static-stdlib-args.lnk {{.*}} -Xlinker --no-allow-multiple-definition
+// CHECK: {{.*}}swiftrt.o /{{.*}}/linker-args-order-linux-{{[a-z0-9]+}}.o -Xlinker --start-group @/{{.*}}/linker-args-order-linux-{{[a-z0-9]+}}.autolink -Xlinker --end-group {{.*}} @{{.*}}/static-stdlib-args.lnk {{.*}} -Xlinker --no-allow-multiple-definition