Address code review comments

Author: AmrDeveloper

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

@@ -4177,7 +4177,7 @@ def CIR_AllocExceptionOp : CIR_Op<"alloc.exception"> {
 
     `void *__cxa_allocate_exception(size_t thrown_size);`
 
-    If operation fails, program terminates, not throw.
+    If the operation fails, the program terminates rather than throw.
 
     Example:
 

clang/lib/CIR/CodeGen/CIRGenCleanup.cpp

@@ -178,36 +178,3 @@ void CIRGenFunction::popCleanupBlocks(
     popCleanupBlock();
   }
 }
-
-void CIRGenFunction::deactivateCleanupBlock(
-    EHScopeStack::stable_iterator cleanup, mlir::Operation *dominatingIP) {
-  assert(cleanup != ehStack.stable_end() && "deactivating bottom of stack?");
-  EHCleanupScope &scope = cast<EHCleanupScope>(*ehStack.find(cleanup));
-  assert(scope.isActive() && "double deactivation");
-
-  // If it's the top of the stack, just pop it, but do so only if it belongs
-  // to the current RunCleanupsScope.
-  if (cleanup == ehStack.stable_begin() &&
-      currentCleanupStackDepth.strictlyEncloses(cleanup)) {
-
-    // Per comment below, checking EHAsynch is not really necessary
-    // it's there to assure zero-impact w/o EHAsynch option
-    if (!scope.isNormalCleanup() && getLangOpts().EHAsynch) {
-      cgm.errorNYI("deactivateCleanupBlock: EHAsynch & non-normal cleanup");
-      return;
-    }
-
-    // From LLVM: If it's a normal cleanup, we need to pretend that the
-    // fallthrough is unreachable.
-    // CIR remarks: LLVM uses an empty insertion point to signal behavior
-    // change to other codegen paths (triggered by PopCleanupBlock).
-    // CIRGen doesn't do that yet, but let's mimic just in case.
-    mlir::OpBuilder::InsertionGuard guard(builder);
-    builder.clearInsertionPoint();
-    popCleanupBlock();
-    return;
-  }
-
-  // Otherwise, follow the general case.
-  cgm.errorNYI("deactivateCleanupBlock: the general case");
-}

clang/lib/CIR/CodeGen/CIRGenCleanup.h

@@ -104,6 +104,7 @@ class alignas(EHScopeStack::ScopeStackAlignment) EHCleanupScope
   bool isNormalCleanup() const { return cleanupBits.isNormalCleanup; }
 
   bool isActive() const { return cleanupBits.isActive; }
+  void setActive(bool isActive) { cleanupBits.isActive = isActive; }
 
   size_t getCleanupSize() const { return cleanupBits.cleanupSize; }
   void *getCleanupBuffer() { return this + 1; }

clang/lib/CIR/CodeGen/CIRGenFunction.h

@@ -1092,9 +1092,6 @@ class CIRGenFunction : public CIRGenTypeCache {
 
   void emitAnyExprToExn(const Expr *e, Address addr);
 
-  void deactivateCleanupBlock(EHScopeStack::stable_iterator cleanup,
-                              mlir::Operation *dominatingIP);
-
   void emitArrayDestroy(mlir::Value begin, mlir::Value numElements,
                         QualType elementType, CharUnits elementAlign,
                         Destroyer *destroyer);

clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp

@@ -1571,10 +1571,9 @@ void CIRGenItaniumCXXABI::emitThrow(CIRGenFunction &cgf,
   cgf.emitAnyExprToExn(e->getSubExpr(), Address(exceptionPtr, exnAlign));
 
   // Get the RTTI symbol address.
-  auto typeInfo = mlir::dyn_cast_if_present<cir::GlobalViewAttr>(
+  auto typeInfo = mlir::cast<cir::GlobalViewAttr>(
       cgm.getAddrOfRTTIDescriptor(subExprLoc, clangThrowType,
                                   /*forEH=*/true));
-  assert(typeInfo && "expected GlobalViewAttr typeinfo");
   assert(!typeInfo.getIndices() && "expected no indirection");
 
   // The address of the destructor.