Merge pull request #8980 from apple/rethrow-single-arg-func-4.0

[Type checker] Handle 'rethrows' checks for single-parameter functions.

Author: DougGregor

lib/Sema/TypeCheckError.cpp

@@ -405,6 +405,7 @@ class ApplyClassifier {
     // But if the expression didn't type-check, suppress diagnostics.
     if (!E->getType() || E->getType()->hasError())
       return Classification::forInvalidCode();
+
     auto type = E->getFn()->getType();
     if (!type) return Classification::forInvalidCode();
     auto fnType = type->getAs<AnyFunctionType>();
@@ -673,11 +674,18 @@ class ApplyClassifier {
         return classifyShuffleRethrowsArgument(shuffle, paramTupleType);
       }
 
-      // Otherwise, we're passing an opaque tuple expression, and we
-      // should treat it as contributing to 'rethrows' if the original
-      // parameter type included a throwing function type.
-      return classifyArgumentByType(paramType,
+      int scalarElt = paramTupleType->getElementForScalarInit();
+      if (scalarElt < 0 ||
+          !paramTupleType->getElementType(scalarElt)->isEqual(arg->getType())) {
+        // Otherwise, we're passing an opaque tuple expression, and we
+        // should treat it as contributing to 'rethrows' if the original
+        // parameter type included a throwing function type.
+        return classifyArgumentByType(
+                                    paramType,
                                     PotentialReason::forRethrowsArgument(arg));
+      }
+
+      paramType = paramTupleType->getElementType(scalarElt);
     }
 
     // Otherwise, if the original parameter type was not a throwing

test/decl/func/rethrows.swift

@@ -476,3 +476,10 @@ func throwWhileGettingFoo() throws -> Foo.Type { return Foo.self }
 
 (throwWhileGettingFoo()).foo(Foo())() // expected-error {{can throw}}
 (try throwWhileGettingFoo()).foo(Foo())()
+
+// <rdar://problem/31794932> [Source compatibility] Call to sort(by):) can throw, but is not marked with 'try'
+func doRethrow(fn: (Int, Int) throws -> Int) rethrows { }
+
+func testDoRethrow() {
+  doRethrow(fn:) { (a, b) in return a }
+}

unittests/runtime/Metadata.cpp

@@ -443,16 +443,19 @@ TEST(MetadataTest, getExistentialMetadata) {
     });
 
   // protocol compositions are order-invariant
-  const ProtocolDescriptor *protoList4[] = {
-    &ProtocolA,
-    &ProtocolB
-  };
-  const ProtocolDescriptor *protoList5[] = {
-    &ProtocolB,
-    &ProtocolA
-  };
   RaceTest_ExpectEqual<const ExistentialTypeMetadata *>(
     [&]() -> const ExistentialTypeMetadata * {
+
+      const ProtocolDescriptor *protoList4[] = {
+        &ProtocolA,
+        &ProtocolB
+      };
+
+      const ProtocolDescriptor *protoList5[] = {
+        &ProtocolB,
+        &ProtocolA
+      };
+
       auto ab = swift_getExistentialTypeMetadata(ProtocolClassConstraint::Any,
                                                 /*superclass=*/nullptr,
                                                 2, protoList4);
@@ -514,13 +517,14 @@ TEST(MetadataTest, getExistentialMetadata) {
       return noWitnessTable;
     });
 
-  const ProtocolDescriptor *protoList8[] = {
-    &ProtocolNoWitnessTable,
-    &ProtocolA,
-    &ProtocolB
-  };
   RaceTest_ExpectEqual<const ExistentialTypeMetadata *>(
     [&]() -> const ExistentialTypeMetadata * {
+      const ProtocolDescriptor *protoList8[] = {
+        &ProtocolNoWitnessTable,
+        &ProtocolA,
+        &ProtocolB
+      };
+
       auto mixedWitnessTable
         = swift_getExistentialTypeMetadata(ProtocolClassConstraint::Class,
                                            /*superclass=*/nullptr,
@@ -560,12 +564,13 @@ TEST(MetadataTest, getExistentialMetadata) {
       return special;
     });
 
-  const ProtocolDescriptor *protoList10[] = {
-    &ProtocolError,
-    &ProtocolA
-  };
   RaceTest_ExpectEqual<const ExistentialTypeMetadata *>(
     [&]() -> const ExistentialTypeMetadata * {
+      const ProtocolDescriptor *protoList10[] = {
+        &ProtocolError,
+        &ProtocolA
+      };
+
       auto special
         = swift_getExistentialTypeMetadata(ProtocolClassConstraint::Any,
                                            /*superclass=*/nullptr,