---

yaml
---
r: 348126
b: refs/heads/master
c: 8084259
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 23a671bce4c0e87ef82b7480616629717d027875
+refs/heads/master: 8084259bf3d601e96009da0a296099e555e7c202
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/SILOptimizer/Utils/CastOptimizer.cpp

@@ -1572,7 +1572,7 @@ static bool optimizeStaticallyKnownProtocolConformance(
     if (!Conformance)
       return false;
 
-    SILBuilder B(Inst);
+    SILBuilderWithScope B(Inst);
     SmallVector<ProtocolConformanceRef, 1> NewConformances;
     NewConformances.push_back(Conformance.getValue());
     ArrayRef<ProtocolConformanceRef> Conformances =

trunk/test/SILOptimizer/castoptimizer-wrongscope.swift

@@ -0,0 +1,12 @@
+// RUN: %target-swift-frontend -emit-sil -o /dev/null \
+// RUN:   %s -Xllvm -sil-print-debuginfo -Onone -sil-verify-all \
+// RUN:   -Xllvm -sil-print-after=diagnostic-constant-propagation \
+// RUN:   2>&1 | %FileCheck %s
+
+// CHECK: alloc_stack $R, loc {{.*}}, scope 2
+// CHECK-NEXT: init_existential_addr {{.*}} : $*R, $Float, loc {{.*}}, scope 2
+// CHECK-NEXT: copy_addr [take] %8 to [initialization] %66 : $*Float, loc {{.*}}, scope 2
+
+protocol R {}
+extension Float: R {}
+print(1.0 as Float? as! R)