---

yaml
---
r: 349376
b: refs/heads/master-next
c: 4d1d2d7
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: d18e355344f07396acfbcde7279dd0be869b2341
+refs/heads/master-next: 4d1d2d7c41bf80e8239c6c345a89768f311aa961
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/SILGen/SILGenStmt.cpp

@@ -961,9 +961,18 @@ void StmtEmitter::visitForEachStmt(ForEachStmt *S) {
   };
 
   auto buildElementRValue = [&](SILLocation loc, SGFContext ctx) {
-    return SGF.emitApplyMethod(
+    RValue result;
+    result = SGF.emitApplyMethod(
         loc, S->getIteratorNext(), buildArgumentSource(),
-        PreparedArguments(ArrayRef<AnyFunctionType::Param>({})), ctx);
+        PreparedArguments(ArrayRef<AnyFunctionType::Param>({})),
+        S->getElementExpr() ? SGFContext() : ctx);
+    if (S->getElementExpr()) {
+      SILGenFunction::OpaqueValueRAII pushOpaqueValue(
+          SGF, S->getElementExpr(),
+          std::move(result).getAsSingleValue(SGF, loc));
+      result = SGF.emitRValue(S->getConvertElementExpr(), ctx);
+    }
+    return result;
   };
   // Then emit the loop destination block.
   //
@@ -976,17 +985,7 @@ void StmtEmitter::visitForEachStmt(ForEachStmt *S) {
     {
       ArgumentScope innerForScope(SGF, SILLocation(S));
       SILLocation loc = SILLocation(S);
-      RValue result;
-      if (S->getElementExpr()) {
-        result = buildElementRValue(loc, SGFContext());
-        SILGenFunction::OpaqueValueRAII pushOpaqueValue(
-            SGF, S->getElementExpr(),
-            std::move(result).getAsSingleValue(SGF, loc));
-        result = SGF.emitRValue(S->getConvertElementExpr(),
-                                SGFContext(nextInit.get()));
-      } else {
-        result = buildElementRValue(loc, SGFContext(nextInit.get()));
-      }
+      RValue result = buildElementRValue(loc, SGFContext(nextInit.get()));
       if (!result.isInContext()) {
         ArgumentSource(SILLocation(S->getSequence()),
                        std::move(result).ensurePlusOne(SGF, loc))

branches/master-next/test/Profiler/pgo_foreach.swift

@@ -42,7 +42,7 @@ public func guessForEach1(x: Int32) -> Int32 {
 // IR-OPT-LABEL: define swiftcc i32 @$s9pgo_foreach10guessWhiles5Int32VAD1x_tF
 
 public func guessForEach2(x: Int32) -> Int32 {
-  // SIL: switch_enum {{.*}} : $Optional<(key: String, value: Int32)>, case #Optional.some!enumelt.1: {{.*}} !case_count(168), case #Optional.none!enumelt: {{.*}} !case_count(42)
+  // SIL: switch_enum {{.*}} : $Optional<(String, Int32)>, case #Optional.some!enumelt.1: {{.*}} !case_count(168), case #Optional.none!enumelt: {{.*}} !case_count(42)
 
   var ret : Int32 = 0
   let names = ["John" : Int32(1), "Paul" : Int32(2), "George" : Int32(3), "Ringo" : Int32(x)]

branches/master-next/test/SILGen/foreach.swift

@@ -592,3 +592,14 @@ func unusedArgPattern(_ xx: [Int]) {
     loopBodyEnd()
   }
 }
+
+// Test for SR-11269. Make sure that the sil contains the needed upcast.
+//
+// CHECK-LABEL: sil hidden [ossa] @$s7foreach25genericFuncWithConversion4listySayxG_tAA1CCRbzlF
+// CHECK: bb2([[ITER_VAL:%.*]] : @owned $T):
+// CHECK:   [[ITER_VAL_UPCAST:%.*]] = upcast [[ITER_VAL]] : $T to $C
+func genericFuncWithConversion<T: C>(list : [T]) {
+  for item: C in list {
+    print(item)
+  }
+}