Merge pull request #25512 from apple/revert-25490-rdar48887384

Revert " [CastOptimizer] Set the correct debug scope for the SILBuilder. "

Author: benlangmuir

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 =