---

yaml
---
r: 340687
b: refs/heads/rxwei-patch-1
c: cc51106
h: refs/heads/master
i:
  340685: e93ca5d
  340683: 4994e19
  340679: 173da6f
  340671: 7cc55ac

Author: swift-ci

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 5ef3df7c5557a0bfff6840b5c7535f76bd5ce5b3
+refs/heads/rxwei-patch-1: cc51106b2d51a5bf7affaff1c42eff30411e6ae4
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/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 =

branches/rxwei-patch-1/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)