Apply new code review suggestions

Author: Andres-Salamanca

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -473,7 +473,7 @@ def StoreOp : CIR_Op<"store", [
 //===----------------------------------------------------------------------===//
 
 def ReturnOp : CIR_Op<"return", [ParentOneOf<["FuncOp", "ScopeOp", "IfOp",
-                                             "DoWhileOp", "WhileOp", "ForOp"]>,
+                                              "DoWhileOp", "WhileOp", "ForOp"]>,
                                  Terminator]> {
   let summary = "Return from function";
   let description = [{
@@ -527,17 +527,17 @@ def IfOp : CIR_Op<"if",
     Examples:
 
     ```mlir
-    cir.if %b  {
+    cir.if %cond  {
       ...
     } else {
       ...
     }
 
-    cir.if %c  {
+    cir.if %cond  {
       ...
     }
 
-    cir.if %c  {
+    cir.if %cond  {
       ...
       cir.br ^a
     ^a:
@@ -613,7 +613,7 @@ def ConditionOp : CIR_Op<"condition", [
 
 def YieldOp : CIR_Op<"yield", [ReturnLike, Terminator,
                                ParentOneOf<["IfOp", "ScopeOp", "WhileOp",
-                                           "ForOp", "DoWhileOp"]>]> {
+                                            "ForOp", "DoWhileOp"]>]> {
   let summary = "Represents the default branching behaviour of a region";
   let description = [{
     The `cir.yield` operation terminates regions on different CIR operations,

clang/lib/CIR/CodeGen/CIRGenExpr.cpp

@@ -540,14 +540,14 @@ mlir::Value CIRGenFunction::emitOpOnBoolExpr(mlir::Location loc,
   assert(!cir::MissingFeatures::shouldReverseUnaryCondOnBoolExpr());
 
   if (isa<ConditionalOperator>(cond)) {
-
     cgm.errorNYI(cond->getExprLoc(), "Ternary NYI");
     assert(!cir::MissingFeatures::ternaryOp());
     return createDummyValue(loc, cond->getType());
   }
 
   if (isa<CXXThrowExpr>(cond)) {
     cgm.errorNYI("NYI");
+    return createDummyValue(loc, cond->getType());
   }
 
   // If the branch has a condition wrapped by __builtin_unpredictable,

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -164,9 +164,9 @@ 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 folded value.
+/// 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.
 bool CIRGenFunction::constantFoldsToSimpleInteger(const Expr *cond,
                                                   llvm::APSInt &resultInt,
                                                   bool allowLabels) {

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

@@ -583,9 +583,8 @@ void cir::IfOp::build(OpBuilder &builder, OperationState &result, Value cond,
   thenBuilder(builder, result.location);
 
   Region *elseRegion = result.addRegion();
-  if (!withElseRegion) {
+  if (!withElseRegion)
     return;
-  }
 
   builder.createBlock(elseRegion);
   elseBuilder(builder, result.location);

clang/test/CIR/CodeGen/if-consteval.cpp

@@ -11,8 +11,8 @@ void f() {
   if consteval {
     result = 10; 
     // CIR-NOT: cir.const #cir.int<10> : !s32i
-    // LLVM-NOT: store i32 10, ptr %1, align 4
-    // OGCG-NOT: store i32 10, ptr %result, align 4
+    // LLVM-NOT: store i32 10
+    // OGCG-NOT: store i32 10
   } else {
     result = 20; 
     // CHECK: cir.const #cir.int<20> : !s32i
@@ -29,15 +29,15 @@ void f() {
   } else {
     result = 40; 
     // CIR-NOT: cir.const #cir.int<40> : !s32i
-    // LLVM-NOT: store i32 40, ptr %1, align 4
-    // OGCG-NOT: store i32 40, ptr %result, align 4
+    // LLVM-NOT: store i32 40
+    // OGCG-NOT: store i32 40
   }
 
   if consteval {
     result = 50; 
     // CIR-NOT: cir.const #cir.int<50> : !s32i
-    // LLVM-NOT: store i32 50, ptr %1, align 4
-    // OGCG-NOT: store i32 50, ptr %result, align 4
+    // LLVM-NOT: store i32 50
+    // OGCG-NOT: store i32 50
   }
 
   if !consteval {

clang/test/CIR/CodeGen/if.cpp

@@ -253,7 +253,7 @@ void if2(int a, bool b, bool c) {
 // OGCG:   ret void
 
 int if_init() {
-  if (int x = 42) {
+  if (int x = 42 ; x) {
     return x + 1; // x should be visible here
   } else {
     return x - 1; // x should also be visible here