Rename ConstantFoldsToSimpleInteger and remove it from missingFeatures

Author: Andres-Salamanca

clang/include/clang/CIR/MissingFeatures.h

@@ -111,7 +111,6 @@ struct MissingFeatures {
   static bool lvalueBaseInfo() { return false; }
   static bool alignCXXRecordDecl() { return false; }
   static bool setNonGC() { return false; }
-  static bool constantFoldsToSimpleInteger() { return false; }
   static bool incrementProfileCounter() { return false; }
   static bool insertBuiltinUnpredictable() { return false; }
 

clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp

@@ -1484,20 +1484,6 @@ mlir::Value ScalarExprEmitter::VisitUnaryLNot(const UnaryOperator *e) {
   return {};
 }
 
-/// If the specified expression does not fold
-/// to a constant, or if it does but contains a label, return false.  If it
-/// constant folds return true and set the boolean result in Result.
-bool CIRGenFunction::constantFoldsToSimpleInteger(const Expr *cond,
-                                                  bool &resultBool,
-                                                  bool allowLabels) {
-  llvm::APSInt resultInt;
-  if (!constantFoldsToSimpleInteger(cond, resultInt, allowLabels))
-    return false;
-
-  resultBool = resultInt.getBoolValue();
-  return true;
-}
-
 /// Return the size or alignment of the type of argument of the sizeof
 /// expression as an integer.
 mlir::Value ScalarExprEmitter::VisitUnaryExprOrTypeTraitExpr(

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -153,7 +153,10 @@ bool CIRGenFunction::containsLabel(const Stmt *s, bool ignoreCaseStmts) {
   if (isa<SwitchCase>(s) && !ignoreCaseStmts)
     return true;
 
-  // If this is a switch statement, we want to ignore cases below it.
+  // If this is a switch statement, we want to ignore case statements when we
+  // recursively process the sub-statements of the switch. If we haven't
+  // encountered a switch statement, we treat case statements like labels, but
+  // if we are processing a switch statement, case statements are expected.
   if (isa<SwitchStmt>(s))
     ignoreCaseStmts = true;
 
@@ -164,6 +167,19 @@ bool CIRGenFunction::containsLabel(const Stmt *s, bool ignoreCaseStmts) {
                      });
 }
 
+/// If the specified expression does not fold to a constant, or if it does but
+/// contains a label, return false.  If it constant folds return true and set
+/// the boolean result in Result.
+bool CIRGenFunction::constantFoldsToBool(const Expr *cond, bool &resultBool,
+                                         bool allowLabels) {
+  llvm::APSInt resultInt;
+  if (!constantFoldsToSimpleInteger(cond, resultInt, allowLabels))
+    return false;
+
+  resultBool = resultInt.getBoolValue();
+  return true;
+}
+
 /// If the specified expression does not fold to a constant, or if it does
 /// fold but contains a label, return false. If it constant folds, return
 /// true and set the folded value.

clang/lib/CIR/CodeGen/CIRGenFunction.h

@@ -170,8 +170,8 @@ class CIRGenFunction : public CIRGenTypeCache {
   /// If the specified expression does not fold to a constant, or if it does but
   /// contains a label, return false.  If it constant folds return true and set
   /// the boolean result in Result.
-  bool constantFoldsToSimpleInteger(const clang::Expr *cond, bool &resultBool,
-                                    bool allowLabels = false);
+  bool constantFoldsToBool(const clang::Expr *cond, bool &resultBool,
+                           bool allowLabels = false);
   bool constantFoldsToSimpleInteger(const clang::Expr *cond,
                                     llvm::APSInt &resultInt,
                                     bool allowLabels = false);

clang/lib/CIR/CodeGen/CIRGenStmt.cpp

@@ -311,8 +311,7 @@ mlir::LogicalResult CIRGenFunction::emitIfStmt(const IfStmt &s) {
     // If the condition folds to a constant and this is an 'if constexpr',
     // we simplify it early in CIRGen to avoid emitting the full 'if'.
     bool condConstant;
-    if (constantFoldsToSimpleInteger(s.getCond(), condConstant,
-                                     s.isConstexpr())) {
+    if (constantFoldsToBool(s.getCond(), condConstant, s.isConstexpr())) {
       if (s.isConstexpr()) {
         // Handle "if constexpr" explicitly here to avoid generating some
         // ill-formed code since in CIR the "if" is no longer simplified