Rework function conversion logic for propagating ExtInfo.

The desired ExtInfo here is not a clean derivation from either the source or destination ExtInfo anymore, so it's clearer and more maintainable to construct a new EI from whole cloth. Response to @jrose-apple's code review.
shijunlin · Nov 4, 2015 · 2cf7f18 · 2cf7f18
1 parent 71485b3
commit 2cf7f18
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -4827,13 +4827,13 @@ Expr *ExprRewriter::coerceToType(Expr *expr, Type toType,
       auto fromEI = fromFunc->getExtInfo(), toEI = toFunc->getExtInfo();
       if ((toEI.isNoEscape() && !fromEI.isNoEscape()) ||
           (toEI.isNoReturn() && !fromEI.isNoReturn())) {
-        auto newToEI =
-          toEI.withIsNoReturn(toEI.isNoReturn()|fromEI.isNoReturn())
-              .withNoEscape(toEI.isNoEscape()|fromEI.isNoEscape())
-              .withThrows(toEI.throws()&fromEI.throws())
-              .withRepresentation(fromEI.getRepresentation());
+        swift::AnyFunctionType::ExtInfo newEI(fromEI.getRepresentation(),
+                                        toEI.isNoReturn() | fromEI.isNoReturn(),
+                                        toEI.isAutoClosure(),
+                                        toEI.isNoEscape() | fromEI.isNoEscape(),
+                                        toEI.throws() & fromEI.throws());
         auto newToType = FunctionType::get(fromFunc->getInput(),
-                                           fromFunc->getResult(), newToEI);
+                                           fromFunc->getResult(), newEI);
         if (applyTypeToClosureExpr(expr, newToType)) {
           fromFunc = newToType;
           // Propagating the bits in might have satisfied the entire