Merge pull request #6137 from xedin/crasher-28282

rudkx · web-flow · commit 297276bb7f5b · 2016-12-08T18:51:55.000-07:00
[QoI] Add return after coercing to TupleElementExpr in ExprRewriter
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -5469,6 +5469,7 @@ Expr *ExprRewriter::coerceToType(Expr *expr, Type toType,
                                         expr->getLoc(),
                                         fromTuple->getElementType(0));
       expr->setImplicit(true);
+      return expr;
     }
   }
 
diff --git a/validation-test/compiler_crashers_fixed/28282-swift-constraints-solution-coercetotype.swift b/validation-test/compiler_crashers_fixed/28282-swift-constraints-solution-coercetotype.swift
@@ -5,6 +5,6 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -typecheck
+// RUN: not %target-swift-frontend %s -typecheck
 class a{let e=(T:{var f:a
 let _=(T:f

Original file line number	Diff line number	Diff line change
`@@ -5469,6 +5469,7 @@ Expr ExprRewriter::coerceToType(Expr expr, Type toType,`
`5469`	`5469`	`expr->getLoc(),`
`5470`	`5470`	`fromTuple->getElementType(0));`
`5471`	`5471`	`expr->setImplicit(true);`
	`5472`	`+ return expr;`
`5472`	`5473`	`}`
`5473`	`5474`	`}`
`5474`	`5475`