commit f82f9fb7a2c236448b5bdb87ff17f34521d09d4d
author Doug Gregor <dgregor@apple.com> Fri Jul 29 01:04:28 2016 -0700
committer Doug Gregor <dgregor@apple.com> Fri Jul 29 01:49:55 2016 -0700
tree a81fea170ad8ebc846b4ed85f4954fd743e99ea4
parent 34791770844b97cab80b6ac6432d9100b72719d3

[SE-0111 SILGen] Dropping labels can make TupleTypes disappear; deal with it.

lib/SILGen/SILGenPoly.cpp

diff --git a/lib/SILGen/SILGenPoly.cpp b/lib/SILGen/SILGenPoly.cpp
index c72b4b0..769fd41 100644
--- a/lib/SILGen/SILGenPoly.cpp
+++ b/lib/SILGen/SILGenPoly.cpp
@@ -812,7 +812,10 @@
         if (outputOrigType.isTuple() &&
             outputOrigType.getNumTupleElements() == 1) {
           outputOrigType = outputOrigType.getTupleElementType(0);
-          outputSubstType = cast<TupleType>(outputSubstType).getElementType(0);
+          if (auto outputSubstTuple = dyn_cast<TupleType>(outputSubstType)) {
+            if (outputSubstTuple->getNumElements() > 0)
+              outputSubstType = outputSubstTuple.getElementType(0);
+          }
           return translate(inputOrigType, inputSubstType,
                            outputOrigType, outputSubstType);
         }

test/SILGen/generic_closures.swift

diff --git a/test/SILGen/generic_closures.swift b/test/SILGen/generic_closures.swift
index e2c2c6d..12621c8 100644
--- a/test/SILGen/generic_closures.swift
+++ b/test/SILGen/generic_closures.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s
+// RUN: %target-swift-frontend -parse-stdlib -emit-silgen -suppress-argument-labels-in-types %s | FileCheck %s
 
 import Swift
 

test/SILGen/partial_apply_init.swift

diff --git a/test/SILGen/partial_apply_init.swift b/test/SILGen/partial_apply_init.swift
index 403178b..66aaf46 100644
--- a/test/SILGen/partial_apply_init.swift
+++ b/test/SILGen/partial_apply_init.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s
+// RUN: %target-swift-frontend -emit-silgen -suppress-argument-labels-in-types %s | FileCheck %s
 
 class C {
   init(x: Int) {}