---

swift-ci · swift-ci · commit d1f671af0214 · 2019-06-17T08:29:07.000-07:00
yaml --- r: 348134 b: refs/heads/master c: fdf1763 h: refs/heads/master
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7e6ef95f4715ae9018cf841a9b801b3673c3afc5
+refs/heads/master: fdf1763f3d9cc7d834266028999a077fb274fa1d
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
diff --git a/trunk/lib/SILOptimizer/Utils/CastOptimizer.cpp b/trunk/lib/SILOptimizer/Utils/CastOptimizer.cpp
@@ -1572,7 +1572,7 @@ static bool optimizeStaticallyKnownProtocolConformance(
     if (!Conformance)
       return false;
 
-    SILBuilderWithScope B(Inst);
+    SILBuilder B(Inst);
     SmallVector<ProtocolConformanceRef, 1> NewConformances;
     NewConformances.push_back(Conformance.getValue());
     ArrayRef<ProtocolConformanceRef> Conformances =
diff --git a/trunk/test/SILOptimizer/castoptimizer-wrongscope.swift b/trunk/test/SILOptimizer/castoptimizer-wrongscope.swift
