Merge pull request #3677 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

lib/FrontendTool/FrontendTool.cpp

@@ -2034,6 +2034,15 @@ int swift::performFrontend(ArrayRef<const char *> Args,
     return finishDiagProcessing(1, /*verifierEnabled*/ false);
   }
 
+  // Don't ask clients to report bugs when running a script in immediate mode.
+  // When a script asserts the compiler reports the error with the same
+  // stacktrace as a compiler crash. From here we can't tell which is which,
+  // for now let's not explicitly ask for bug reports.
+  if (Invocation.getFrontendOptions().RequestedAction ==
+      FrontendOptions::ActionType::Immediate) {
+    llvm::setBugReportMsg(nullptr);
+  }
+
   PrettyStackTraceFrontend frontendTrace(Invocation.getLangOptions());
 
   // Make an array of PrettyStackTrace objects to dump the configuration files

lib/SIL/IR/SILFunctionType.cpp

@@ -2203,8 +2203,13 @@ static CanSILFunctionType getSILFunctionType(
 
   // Lower the capture context parameters, if any.
   if (constant && constant->getAnyFunctionRef()) {
+    // Lower in the context of the closure. Since the set of captures is a
+    // private contract between the closure and its enclosing context, we
+    // don't need to keep its capture types opaque.
     auto expansion = TypeExpansionContext::maximal(
-        expansionContext.getContext(), expansionContext.isWholeModuleContext());
+        constant->getAnyFunctionRef()->getAsDeclContext(), false);
+    // ...unless it's inlinable, in which case it might get inlined into
+    // some place we need to keep opaque types opaque.
     if (constant->isSerialized())
       expansion = TypeExpansionContext::minimal();
     lowerCaptureContextParameters(TC, *constant, genericSig, expansion, inputs);

test/Frontend/immediate-mode-crash.swift

@@ -0,0 +1,9 @@
+/// Don't ask to file a bug report on a script failure.
+
+// REQUIRES: swift_interpreter
+
+// RUN: not --crash %target-swift-frontend -interpret %s 2>&1 | %FileCheck %s
+
+assert(false)
+// CHECK: Assertion failed
+// CHECK-NOT: Please submit a bug report

test/Interop/Cxx/stdlib/std-module-interface.swift

@@ -3,13 +3,14 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=std.string -source-filename=x -enable-cxx-interop -tools-directory=%llvm_obj_root/bin -module-cache-path %t | %FileCheck %s  -check-prefix=CHECK-STRING
 
 // Clang driver on Windows doesn't support -stdlib=libc++
-// XFAIL: OS=windows-msvc
+// UNSUPPORTED: OS=windows-msvc
 
-// libstdc++ cannot currently be imported.
-// XFAIL: OS=linux-gnu
+// libstdc++ cannot currently be imported
+// UNSUPPORTED: OS=linux-gnu
+// UNSUPPORTED: OS=linux-androideabi
+// UNSUPPORTED: OS=linux-android
 
-// XFAIL: OS=linux-androideabi
-// XFAIL: OS=linux-android
+// REQUIRES: rdar84036022
 
 // CHECK-STD: import std.iosfwd
 // CHECK-STD: import std.string

test/SILGen/opaque_result_type_captured.swift

@@ -0,0 +1,26 @@
+// RUN: %target-swift-emit-silgen -disable-availability-checking -verify %s
+// rdar://83378116
+
+public protocol P {}
+public protocol Q {}
+
+struct SP<T: P>: P { init(t: T) {} }
+struct SQ: Q {}
+
+struct Tubb<C: Q, T, F> {
+}
+
+extension Tubb: P where T: P, F: P {
+    init(c: C, t: () -> T, f: () -> F) {}
+}
+
+struct SP2: P {}
+
+func bar() -> some P { return SP2() }
+
+public struct Butt {
+    public func foo() -> some P {
+        let sp = SP(t: bar())
+        return Tubb(c: SQ(), t: { sp }, f: { sp })
+    }
+}