Merge pull request #38328 from xedin/rdar-79657350

[Diagnostics] Diagnose ambiguous solutions with warnings like regular…

Author: xedin

lib/Sema/ConstraintSystem.cpp

@@ -3911,6 +3911,16 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
     }
   }
 
+  // If there either no fixes at all or all of the are warnings,
+  // let's diagnose this as regular ambiguity.
+  if (llvm::all_of(solutions, [](const Solution &solution) {
+        return llvm::all_of(solution.Fixes, [](const ConstraintFix *fix) {
+          return fix->isWarning();
+        });
+      })) {
+    return diagnoseAmbiguity(solutions);
+  }
+
   // Algorithm is as follows:
   //
   // a. Aggregate all of the available fixes based on callee locator;

test/stdlib/UnsafePointerDiagnostics_warning.swift

@@ -201,10 +201,10 @@ func unsafePointerInitEphemeralConversions() {
   // expected-note@-2 {{use the 'withUnsafeMutableBytes' method on Array in order to explicitly convert argument to buffer pointer valid for a defined scope}}
 
   // FIXME: This is currently ambiguous.
-  _ = OpaquePointer(&foo) // expected-error {{no exact matches in call to initializer}}
+  _ = OpaquePointer(&foo) // expected-error {{ambiguous use of 'init(_:)'}}
 
   // FIXME: This is currently ambiguous.
-  _ = OpaquePointer(&arr) // expected-error {{no exact matches in call to initializer}}
+  _ = OpaquePointer(&arr) // expected-error {{ambiguous use of 'init(_:)'}}
 
   _ = OpaquePointer(arr) // expected-warning {{initialization of 'OpaquePointer' results in a dangling pointer}}
   // expected-note@-1 {{implicit argument conversion from '[Int]' to 'UnsafeRawPointer' produces a pointer valid only for the duration of the call to 'init(_:)'}}

validation-test/Sema/type_checker_crashers_fixed/sr14817.swift

@@ -0,0 +1,25 @@
+// RUN: %target-typecheck-verify-swift
+
+@resultBuilder
+struct MyResultBuilder {
+  static func buildBlock(_ elements: Int...) -> Int { fatalError() }
+}
+
+struct VariableDecl2 {
+  init( // expected-note {{found this candidate}}
+    paramClosure: () -> Int? = { nil },
+    paramInt: Int,
+    @MyResultBuilder paramResultBuilder: () -> Int? = { nil }
+  ) { fatalError() }
+
+  init( // expected-note {{found this candidate}}
+    paramInt: Int,
+    paramClosure: () -> Int? = { nil },
+    @MyResultBuilder paramResultBuilder: () -> Int? = { nil }
+  ) {
+    fatalError()
+  }
+}
+
+let buildable = VariableDecl2(paramInt: 1) { // expected-error {{ambiguous use of 'init'}}
+}