Merge pull request #1283 from swiftwasm/release/5.3

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

Author: pull[bot]

lib/AST/GenericSignatureBuilder.cpp

@@ -837,6 +837,11 @@ const RequirementSource *RequirementSource::getMinimalConformanceSource(
 
       if (parentEquivClass->concreteType)
         derivedViaConcrete = true;
+      else if (parentEquivClass->superclass &&
+               builder.lookupConformance(parentType->getCanonicalType(),
+                                         parentEquivClass->superclass,
+                                         source->getProtocolDecl()))
+        derivedViaConcrete = true;
 
       // The parent potential archetype must conform to the protocol in which
       // this requirement resides. Add this constraint.

lib/Sema/CSApply.cpp

@@ -2643,6 +2643,7 @@ namespace {
       if (!witness || !isa<AbstractFunctionDecl>(witness.getDecl()))
         return nullptr;
       expr->setInitializer(witness);
+      expr->setArg(cs.coerceToRValue(expr->getArg()));
       return expr;
     }
 

lib/Sema/CSBindings.cpp

@@ -69,6 +69,9 @@ void ConstraintSystem::inferTransitiveSupertypeBindings(
 
       auto type = binding.BindingType;
 
+      if (type->isHole())
+        continue;
+
       if (!existingTypes.insert(type->getCanonicalType()).second)
         continue;
 

test/Constraints/overload.swift

@@ -238,3 +238,10 @@ func autoclosure1<T>(_: [T], _: X) { }
 func test_autoclosure1(ia: [Int]) {
   autoclosure1(ia, X()) // okay: resolves to the second function
 }
+
+// rdar://problem/64368545 - failed to produce diagnostic (hole propagated to func result without recording a fix)
+func test_no_hole_propagation() {
+  func test(withArguments arguments: [String]) -> String {
+    return arguments.reduce(0, +) // expected-error {{cannot convert value of type 'Int' to expected argument type 'String'}}
+  }
+}

test/Generics/superclass_constraint_self_derived.swift

@@ -0,0 +1,25 @@
+// RUN: %target-typecheck-verify-swift
+
+protocol P {
+  associatedtype T : Q
+}
+
+protocol Q {
+  associatedtype T : R
+
+  var t: T { get }
+}
+
+protocol R {}
+
+func takesR<T : R>(_: T) {}
+
+class C<T : Q> : P {}
+
+struct Outer<T : P> {
+  struct Inner<U> where T : C<U> {
+    func doStuff(_ u: U) {
+      takesR(u.t)
+    }
+  }
+}

test/SILGen/class_conforms_with_default_implementation.swift

@@ -0,0 +1,48 @@
+// RUN: %target-swift-emit-silgen %s | %FileCheck %s
+
+protocol P {
+  associatedtype T : Q
+  func foo()
+}
+
+extension P {
+  func foo() {}
+}
+
+protocol Q {}
+
+class C<T : Q> : P {}
+
+protocol PP {
+  associatedtype T : QQ
+  func foo()
+}
+
+extension PP {
+  func foo() {}
+}
+
+class QQ {}
+
+class CC<T : QQ> : PP {}
+
+// CHECK-LABEL: sil private [transparent] [thunk] [ossa] @$s42class_conforms_with_default_implementation1CCyqd__GAA1PA2aEP3fooyyFTW : $@convention(witness_method: P) <τ_0_0><τ_1_0 where τ_0_0 : C<τ_1_0>, τ_1_0 : Q> (@in_guaranteed τ_0_0) -> () {
+// CHECK: [[WITNESS:%.*]] = function_ref @$s42class_conforms_with_default_implementation1PPAAE3fooyyF : $@convention(method) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> ()
+// CHECK: apply [[WITNESS]]<τ_0_0>(%0) : $@convention(method) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> ()
+// CHECK: return
+
+// CHECK-LABEL: sil private [transparent] [thunk] [ossa] @$s42class_conforms_with_default_implementation2CCCyqd__GAA2PPA2aEP3fooyyFTW : $@convention(witness_method: PP) <τ_0_0><τ_1_0 where τ_0_0 : CC<τ_1_0>, τ_1_0 : QQ> (@in_guaranteed τ_0_0) -> () {
+// CHECK: [[WITNESS:%.*]] = function_ref @$s42class_conforms_with_default_implementation2PPPAAE3fooyyF : $@convention(method) <τ_0_0 where τ_0_0 : PP> (@in_guaranteed τ_0_0) -> ()
+// CHECK: apply [[WITNESS]]<τ_0_0>(%0) : $@convention(method) <τ_0_0 where τ_0_0 : PP> (@in_guaranteed τ_0_0) -> ()
+// CHECK: return
+
+// CHECK-LABEL: sil_witness_table hidden <T where T : Q> C<T>: P module class_conforms_with_default_implementation {
+// CHECK-NEXT: associated_type_protocol (T: Q): dependent
+// CHECK-NEXT: associated_type T: T
+// CHECK-NEXT: method #P.foo: <Self where Self : P> (Self) -> () -> () : @$s42class_conforms_with_default_implementation1CCyqd__GAA1PA2aEP3fooyyFTW
+// CHECK-NEXT: }
+
+// CHECK-LABEL: sil_witness_table hidden <T where T : QQ> CC<T>: PP module class_conforms_with_default_implementation {
+// CHECK-NEXT: associated_type T: T
+// CHECK-NEXT: method #PP.foo: <Self where Self : PP> (Self) -> () -> () : @$s42class_conforms_with_default_implementation2CCCyqd__GAA2PPA2aEP3fooyyFTW
+// CHECK-NEXT: }

test/Sema/object_literals_osx.swift

@@ -27,3 +27,13 @@ let text = #fileLiteral(resourceName: "TextFile.txt").relativeString! // expecte
 
 // rdar://problem/49861813
 #fileLiteral() // expected-error{{missing argument for parameter 'resourceName' in call}} expected-error{{could not infer type of file reference literal}} expected-note{{import Foundation to use 'URL' as the default file reference literal type}}
+
+// rdar://problem/62927467
+func test_literal_arguments_are_loaded() {
+  var resource = "foo.txt" // expected-warning {{variable 'resource' was never mutated; consider changing to 'let' constant}}
+  let _: Path = #fileLiteral(resourceName: resource) // Ok
+
+  func test(red: inout Float, green: inout Float) -> S {
+    return #colorLiteral(red: red, green: green, blue: 1, alpha: 1) // Ok
+  }
+}

validation-test/compiler_crashers_2/sr11108.swift renamed to validation-test/compiler_crashers_2_fixed/sr11108.swift

@@ -1,6 +1,4 @@
-// RUN: not --crash %target-swift-emit-silgen %s
-
-// REQUIRES: asserts
+// RUN: %target-swift-emit-silgen %s
 
 protocol Example {
     associatedtype Signed: SignedInteger