Merge pull request #24780 from ravikandhadai/constexpr-refactoring

Author: swift-ci

include/swift/SILOptimizer/Utils/ConstExpr.h

@@ -99,8 +99,8 @@ class ConstExprStepEvaluator {
   /// evaluation.
   SmallPtrSet<SILBasicBlock *, 8> visitedBlocks;
 
-  ConstExprStepEvaluator(const ConstExprEvaluator &) = delete;
-  void operator=(const ConstExprEvaluator &) = delete;
+  ConstExprStepEvaluator(const ConstExprStepEvaluator &) = delete;
+  void operator=(const ConstExprStepEvaluator &) = delete;
 
 public:
   /// Constructs a step evaluator given an allocator and a non-null pointer to a

lib/SILOptimizer/Utils/ConstExpr.cpp

@@ -1554,9 +1554,8 @@ void ConstExprEvaluator::computeConstantValues(
 
 ConstExprStepEvaluator::ConstExprStepEvaluator(SymbolicValueAllocator &alloc,
                                                SILFunction *fun)
-    : evaluator(ConstExprEvaluator(alloc)),
-      internalState(
-          new ConstExprFunctionState(evaluator, fun, {}, stepsEvaluated)) {
+    : evaluator(alloc), internalState(new ConstExprFunctionState(
+                            evaluator, fun, {}, stepsEvaluated)) {
   assert(fun);
 }