Default evaluation flag to false

Author: zyn0217

clang/lib/AST/ByteCode/Compiler.cpp

@@ -5181,7 +5181,7 @@ template <class Emitter> bool Compiler<Emitter>::visitIfStmt(const IfStmt *IS) {
       return false;
 
   if (const DeclStmt *CondDecl = IS->getConditionVariableDeclStmt())
-    if (!visitDeclStmt(CondDecl, /*EvaluateConditionDecl=*/false))
+    if (!visitDeclStmt(CondDecl))
       return false;
 
   // Compile condition.
@@ -5258,7 +5258,7 @@ bool Compiler<Emitter>::visitWhileStmt(const WhileStmt *S) {
   {
     LocalScope<Emitter> CondScope(this);
     if (const DeclStmt *CondDecl = S->getConditionVariableDeclStmt())
-      if (!visitDeclStmt(CondDecl, /*EvaluateConditionDecl=*/false))
+      if (!visitDeclStmt(CondDecl))
         return false;
 
     if (!this->visitBool(Cond))
@@ -5340,7 +5340,7 @@ bool Compiler<Emitter>::visitForStmt(const ForStmt *S) {
   {
     LocalScope<Emitter> CondScope(this);
     if (const DeclStmt *CondDecl = S->getConditionVariableDeclStmt())
-      if (!visitDeclStmt(CondDecl, /*EvaluateConditionDecl=*/false))
+      if (!visitDeclStmt(CondDecl))
         return false;
 
     if (Cond) {
@@ -5468,7 +5468,7 @@ bool Compiler<Emitter>::visitSwitchStmt(const SwitchStmt *S) {
       return false;
 
   if (const DeclStmt *CondDecl = S->getConditionVariableDeclStmt())
-    if (!visitDeclStmt(CondDecl, /*EvaluateConditionDecl=*/false))
+    if (!visitDeclStmt(CondDecl))
       return false;
 
   // Initialize condition variable.

clang/lib/AST/ByteCode/Compiler.h

@@ -213,7 +213,7 @@ class Compiler : public ConstStmtVisitor<Compiler<Emitter>, bool>,
 
   // Statements.
   bool visitCompoundStmt(const CompoundStmt *S);
-  bool visitDeclStmt(const DeclStmt *DS, bool EvaluateConditionDecl);
+  bool visitDeclStmt(const DeclStmt *DS, bool EvaluateConditionDecl = false);
   bool visitReturnStmt(const ReturnStmt *RS);
   bool visitIfStmt(const IfStmt *IS);
   bool visitWhileStmt(const WhileStmt *S);

clang/lib/AST/ExprConstant.cpp

@@ -5222,7 +5222,7 @@ static bool EvaluateDecompositionDeclInit(EvalInfo &Info,
                                           const DecompositionDecl *DD);
 
 static bool EvaluateDecl(EvalInfo &Info, const Decl *D,
-                         bool EvaluateConditionDecl) {
+                         bool EvaluateConditionDecl = false) {
   if (const VarDecl *VD = dyn_cast<VarDecl>(D))
     if (!EvaluateVarDecl(Info, VD))
       return false;
@@ -5260,8 +5260,7 @@ static bool EvaluateCond(EvalInfo &Info, const VarDecl *CondDecl,
   if (Cond->isValueDependent())
     return false;
   FullExpressionRAII Scope(Info);
-  if (CondDecl &&
-      !EvaluateDecl(Info, CondDecl, /*EvaluateConditionDecl=*/false))
+  if (CondDecl && !EvaluateDecl(Info, CondDecl))
     return false;
   if (!EvaluateAsBooleanCondition(Cond, Result, Info))
     return false;
@@ -5342,8 +5341,7 @@ static EvalStmtResult EvaluateSwitch(StmtResult &Result, EvalInfo &Info,
 
     FullExpressionRAII CondScope(Info);
     if (SS->getConditionVariable() &&
-        !EvaluateDecl(Info, SS->getConditionVariable(),
-                      /*EvaluateConditionDecl=*/false))
+        !EvaluateDecl(Info, SS->getConditionVariable()))
       return ESR_Failed;
     if (SS->getCond()->isValueDependent()) {
       // We don't know what the value is, and which branch should jump to.

clang/lib/CodeGen/CGStmt.cpp

@@ -894,7 +894,7 @@ void CodeGenFunction::EmitIfStmt(const IfStmt &S) {
     EmitStmt(S.getInit());
 
   if (S.getConditionVariable())
-    EmitDecl(*S.getConditionVariable(), /*EvaluateConditionDecl=*/false);
+    EmitDecl(*S.getConditionVariable());
 
   // If the condition constant folds and can be elided, try to avoid emitting
   // the condition and the dead arm of the if/else.
@@ -1100,7 +1100,7 @@ void CodeGenFunction::EmitWhileStmt(const WhileStmt &S,
   RunCleanupsScope ConditionScope(*this);
 
   if (S.getConditionVariable())
-    EmitDecl(*S.getConditionVariable(), /*EvaluateConditionDecl=*/false);
+    EmitDecl(*S.getConditionVariable());
 
   // Evaluate the conditional in the while header.  C99 6.8.5.1: The
   // evaluation of the controlling expression takes place before each
@@ -1319,7 +1319,7 @@ void CodeGenFunction::EmitForStmt(const ForStmt &S,
     // If the for statement has a condition scope, emit the local variable
     // declaration.
     if (S.getConditionVariable()) {
-      EmitDecl(*S.getConditionVariable(), /*EvaluateConditionDecl=*/false);
+      EmitDecl(*S.getConditionVariable());
 
       // We have entered the condition variable's scope, so we're now able to
       // jump to the continue block.
@@ -1679,7 +1679,7 @@ void CodeGenFunction::EmitDeclStmt(const DeclStmt &S) {
     EmitStopPoint(&S);
 
   for (const auto *I : S.decls())
-    EmitDecl(*I);
+    EmitDecl(*I, /*EvaluateConditionDecl=*/true);
 }
 
 void CodeGenFunction::EmitBreakStmt(const BreakStmt &S) {
@@ -2244,7 +2244,7 @@ void CodeGenFunction::EmitSwitchStmt(const SwitchStmt &S) {
       // Emit the condition variable if needed inside the entire cleanup scope
       // used by this special case for constant folded switches.
       if (S.getConditionVariable())
-        EmitDecl(*S.getConditionVariable(), /*EvaluateConditionDecl=*/false);
+        EmitDecl(*S.getConditionVariable());
 
       if (auto *DD =
               dyn_cast_if_present<DecompositionDecl>(S.getConditionVariable()))
@@ -2278,7 +2278,7 @@ void CodeGenFunction::EmitSwitchStmt(const SwitchStmt &S) {
     EmitStmt(S.getInit());
 
   if (S.getConditionVariable())
-    EmitDecl(*S.getConditionVariable(), /*EvaluateConditionDecl=*/false);
+    EmitDecl(*S.getConditionVariable());
   llvm::Value *CondV = EmitScalarExpr(S.getCond());
 
   if (auto *DD =

clang/lib/CodeGen/CodeGenFunction.h

@@ -3377,7 +3377,7 @@ class CodeGenFunction : public CodeGenTypeCache {
   /// EmitDecl - Emit a declaration.
   ///
   /// This function can be called with a null (unreachable) insert point.
-  void EmitDecl(const Decl &D, bool EvaluateConditionDecl = true);
+  void EmitDecl(const Decl &D, bool EvaluateConditionDecl = false);
 
   /// EmitVarDecl - Emit a local variable declaration.
   ///