Address code review comments

Author: AmrDeveloper

clang/lib/CIR/CodeGen/CIRGenCXXABI.cpp

@@ -38,7 +38,7 @@ CIRGenCXXABI::AddedStructorArgCounts CIRGenCXXABI::addImplicitConstructorArgs(
 }
 
 CatchTypeInfo CIRGenCXXABI::getCatchAllTypeInfo() {
-  return CatchTypeInfo{nullptr, 0};
+  return CatchTypeInfo{{}, 0};
 }
 
 void CIRGenCXXABI::buildThisParam(CIRGenFunction &cgf,

clang/lib/CIR/CodeGen/CIRGenCleanup.h

@@ -82,7 +82,7 @@ class EHScope {
 
   Kind getKind() const { return static_cast<Kind>(commonBits.kind); }
 
-  bool hasEHBranches() const {
+  bool mayThrow() const {
     // Traditional LLVM codegen also checks for `!block->use_empty()`, but
     // in CIRGen the block content is not important, just used as a way to
     // signal `hasEHBranches`.
@@ -105,12 +105,11 @@ class EHCatchScope : public EHScope {
 
 public:
   struct Handler {
-    /// A type info value, or null (C++ null, not an LLVM null pointer)
-    /// for a catch-all.
+    /// A type info value, or null MLIR attribute for a catch-all
     CatchTypeInfo type;
 
     /// The catch handler for this type.
-    mlir::Block *block;
+    mlir::Region *region;
   };
 
 private:
@@ -130,10 +129,10 @@ class EHCatchScope : public EHScope {
 
   unsigned getNumHandlers() const { return catchBits.numHandlers; }
 
-  void setHandler(unsigned i, CatchTypeInfo type, mlir::Block *block) {
+  void setHandler(unsigned i, CatchTypeInfo type, mlir::Region *region) {
     assert(i < getNumHandlers());
     getHandlers()[i].type = type;
-    getHandlers()[i].block = block;
+    getHandlers()[i].region = region;
   }
 
   // Clear all handler blocks.

clang/lib/CIR/CodeGen/CIRGenException.cpp

@@ -111,8 +111,8 @@ CIRGenFunction::emitCXXTryStmtUnderScope(const CXXTryStmt &s) {
   }
 
   // Create the scope to represent only the C/C++ `try {}` part. However,
-  // don't populate right away. Reserve some space to store the exception
-  // info but don't emit the bulk right away, for now only make sure the
+  // don't populate right away. Create regions for the catch handlers,
+  // but don't emit the handler bodies yet. For now, only make sure the
   // scope returns the exception information.
   auto tryOp = cir::TryOp::create(
       builder, tryLoc,
@@ -130,8 +130,10 @@ CIRGenFunction::emitCXXTryStmtUnderScope(const CXXTryStmt &s) {
         unsigned numRegionsToCreate =
             hasCatchAll ? numHandlers : numHandlers + 1;
 
-        for (unsigned i = 0; i != numRegionsToCreate; ++i)
-          builder.createBlock(result.addRegion());
+        for (unsigned i = 0; i != numRegionsToCreate; ++i) {
+          mlir::Region *region = result.addRegion();
+          builder.createBlock(region);
+        }
       });
 
   // Finally emit the body for try/catch.
@@ -175,10 +177,10 @@ void CIRGenFunction::enterCXXTryStmt(const CXXTryStmt &s, cir::TryOp tryOp,
     }
 
     // No exception decl indicates '...', a catch-all.
-    mlir::Block *handler = &tryOp.getHandlerRegions()[i].getBlocks().front();
+    mlir::Region *handler = &tryOp.getHandlerRegions()[i];
     catchScope->setHandler(i, cgm.getCXXABI().getCatchAllTypeInfo(), handler);
 
-    // Under async exceptions, catch(...) need to catch HW exception too
+    // Under async exceptions, catch(...) needs to catch HW exception too
     // Mark scope with SehTryBegin as a SEH __try scope
     if (getLangOpts().EHAsynch) {
       cgm.errorNYI("enterCXXTryStmt: EHAsynch");
@@ -194,7 +196,7 @@ void CIRGenFunction::exitCXXTryStmt(const CXXTryStmt &s, bool isFnTryBlock) {
   cir::TryOp tryOp = curLexScope->getTry();
 
   // If the catch was not required, bail out now.
-  if (!catchScope.hasEHBranches()) {
+  if (!catchScope.mayThrow()) {
     catchScope.clearHandlerBlocks();
     ehStack.popCatch();
 

clang/lib/CIR/CodeGen/CIRGenFunction.h

@@ -942,7 +942,7 @@ class CIRGenFunction : public CIRGenTypeCache {
 
     LexicalScope *parentScope = nullptr;
 
-    // Holds actual value for ScopeKind::Try
+    // Holds the actual value for ScopeKind::Try
     cir::TryOp tryOp = nullptr;
 
     // Only Regular is used at the moment. Support for other kinds will be