Merge pull request llvm#23981 from gottesmm/pr-d8251fee09379fbd0cee5696f7b97a85ca886cb2

Author: swift-ci

include/swift/SILOptimizer/Utils/CastOptimizer.h

@@ -34,34 +34,34 @@ struct SILDynamicCastInst;
 
 /// This is a helper class used to optimize casts.
 class CastOptimizer {
-  SILOptFunctionBuilder &FunctionBuilder;
+  SILOptFunctionBuilder &functionBuilder;
 
   /// Temporary context for clients that do not provide their own.
-  SILBuilderContext TempBuilderContext;
+  SILBuilderContext tempBuilderContext;
 
   /// Reference to the provided SILBuilderContext.
-  SILBuilderContext &BuilderContext;
+  SILBuilderContext &builderContext;
 
   /// Callback that replaces the first SILValue's uses with a use of the second
   /// value.
-  std::function<void(SILValue, SILValue)> ReplaceValueUsesAction;
+  std::function<void(SILValue, SILValue)> replaceValueUsesAction;
 
   /// Callback that replaces a SingleValueInstruction with a ValueBase after
   /// updating any status in the caller.
   std::function<void(SingleValueInstruction *, ValueBase *)>
-      ReplaceInstUsesAction;
+      replaceInstUsesAction;
 
   /// Callback that erases an instruction and performs any state updates in the
   /// caller required.
-  std::function<void(SILInstruction *)> EraseInstAction;
+  std::function<void(SILInstruction *)> eraseInstAction;
 
   /// Callback to call after an optimization was performed based on the fact
   /// that a cast will succeed.
-  std::function<void()> WillSucceedAction;
+  std::function<void()> willSucceedAction;
 
   /// Callback to call after an optimization was performed based on the fact
   /// that a cast will fail.
-  std::function<void()> WillFailAction;
+  std::function<void()> willFailAction;
 
 public:
   CastOptimizer(SILOptFunctionBuilder &FunctionBuilder,
@@ -72,13 +72,13 @@ class CastOptimizer {
                 std::function<void(SILInstruction *)> EraseAction,
                 std::function<void()> WillSucceedAction,
                 std::function<void()> WillFailAction = []() {})
-      : FunctionBuilder(FunctionBuilder),
-        TempBuilderContext(FunctionBuilder.getModule()),
-        BuilderContext(BuilderContext ? *BuilderContext : TempBuilderContext),
-        ReplaceValueUsesAction(ReplaceValueUsesAction),
-        ReplaceInstUsesAction(ReplaceInstUsesAction),
-        EraseInstAction(EraseAction), WillSucceedAction(WillSucceedAction),
-        WillFailAction(WillFailAction) {}
+      : functionBuilder(FunctionBuilder),
+        tempBuilderContext(FunctionBuilder.getModule()),
+        builderContext(BuilderContext ? *BuilderContext : tempBuilderContext),
+        replaceValueUsesAction(ReplaceValueUsesAction),
+        replaceInstUsesAction(ReplaceInstUsesAction),
+        eraseInstAction(EraseAction), willSucceedAction(WillSucceedAction),
+        willFailAction(WillFailAction) {}
 
   // This constructor is used in
   // 'SILOptimizer/Mandatory/ConstantPropagation.cpp'. MSVC2015 compiler

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

@@ -2149,23 +2149,23 @@ bool SimplifyCFG::simplifyCheckedCastBranchBlock(CheckedCastBranchInst *CCBI) {
   bool MadeChange = false;
   CastOptimizer CastOpt(
       FuncBuilder, nullptr /*SILBuilderContext*/,
-      /* ReplaceValueUsesAction */
+      /* replaceValueUsesAction */
       [&MadeChange](SILValue oldValue, SILValue newValue) {
         MadeChange = true;
       },
-      /* ReplaceInstUsesAction */
+      /* replaceInstUsesAction */
       [&MadeChange](SILInstruction *I, ValueBase *V) { MadeChange = true; },
-      /* EraseInstAction */
+      /* eraseInstAction */
       [&MadeChange](SILInstruction *I) {
         MadeChange = true;
         I->eraseFromParent();
       },
-      /* WillSucceedAction */
+      /* willSucceedAction */
       [&]() {
         MadeChange |= removeIfDead(FailureBB);
         addToWorklist(ThisBB);
       },
-      /* WillFailAction */
+      /* willFailAction */
       [&]() {
         MadeChange |= removeIfDead(SuccessBB);
         addToWorklist(ThisBB);
@@ -2184,23 +2184,23 @@ bool SimplifyCFG::simplifyCheckedCastValueBranchBlock(
   bool MadeChange = false;
   CastOptimizer CastOpt(
       FuncBuilder, nullptr /*SILBuilderContext*/,
-      /* ReplaceValueUsesAction */
+      /* replaceValueUsesAction */
       [&MadeChange](SILValue oldValue, SILValue newValue) {
         MadeChange = true;
       },
-      /* ReplaceInstUsesAction */
+      /* replaceInstUsesAction */
       [&MadeChange](SILInstruction *I, ValueBase *V) { MadeChange = true; },
-      /* EraseInstAction */
+      /* eraseInstAction */
       [&MadeChange](SILInstruction *I) {
         MadeChange = true;
         I->eraseFromParent();
       },
-      /* WillSucceedAction */
+      /* willSucceedAction */
       [&]() {
         MadeChange |= removeIfDead(FailureBB);
         addToWorklist(ThisBB);
       },
-      /* WillFailAction */
+      /* willFailAction */
       [&]() {
         MadeChange |= removeIfDead(SuccessBB);
         addToWorklist(ThisBB);
@@ -2220,21 +2220,21 @@ simplifyCheckedCastAddrBranchBlock(CheckedCastAddrBranchInst *CCABI) {
   bool MadeChange = false;
   CastOptimizer CastOpt(
       FuncBuilder, nullptr /*SILBuilderContext*/,
-      /* ReplaceValueUsesAction */
+      /* replaceValueUsesAction */
       [&MadeChange](SILValue, SILValue) { MadeChange = true; },
-      /* ReplaceInstUsesAction */
+      /* replaceInstUsesAction */
       [&MadeChange](SILInstruction *I, ValueBase *V) { MadeChange = true; },
-      /* EraseInstAction */
+      /* eraseInstAction */
       [&MadeChange](SILInstruction *I) {
         MadeChange = true;
         I->eraseFromParent();
       },
-      /* WillSucceedAction */
+      /* willSucceedAction */
       [&]() {
         MadeChange |= removeIfDead(FailureBB);
         addToWorklist(ThisBB);
       },
-      /* WillFailAction */
+      /* willFailAction */
       [&]() {
         MadeChange |= removeIfDead(SuccessBB);
         addToWorklist(ThisBB);