[clang] e0e2c8d - [CIR] Implement EH handling for base class initializer (#192358)
via cfe-commits
cfe-commits at lists.llvm.org
Wed Apr 15 16:51:07 PDT 2026
Author: Andy Kaylor
Date: 2026-04-15T16:51:03-07:00
New Revision: e0e2c8d9e065df78c17c4ed34a8133e2a863d94f
URL: https://github.com/llvm/llvm-project/commit/e0e2c8d9e065df78c17c4ed34a8133e2a863d94f
DIFF: https://github.com/llvm/llvm-project/commit/e0e2c8d9e065df78c17c4ed34a8133e2a863d94f.diff
LOG: [CIR] Implement EH handling for base class initializer (#192358)
This implements exception handling when a base class initializer is
called from a dervied class' constructor. The cleanup handler to call
the base class dtor was already implemented. We just needed to push the
cleanup on the EH stack.
Added:
clang/test/CIR/CodeGen/base-init-eh.cpp
Modified:
clang/lib/CIR/CodeGen/CIRGenClass.cpp
Removed:
################################################################################
diff --git a/clang/lib/CIR/CodeGen/CIRGenClass.cpp b/clang/lib/CIR/CodeGen/CIRGenClass.cpp
index 9c84fe574be45..f195b43ab1e57 100644
--- a/clang/lib/CIR/CodeGen/CIRGenClass.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenClass.cpp
@@ -286,7 +286,8 @@ void CIRGenFunction::emitBaseInitializer(mlir::Location loc,
emitAggExpr(baseInit->getInit(), aggSlot);
if (cgm.getLangOpts().Exceptions && !baseClassDecl->hasTrivialDestructor())
- cgm.errorNYI(baseInit->getSourceRange(), "call base destructor");
+ ehStack.pushCleanup<CallBaseDtor>(EHCleanup, baseClassDecl,
+ /*baseIsVirtual=*/isBaseVirtual);
}
/// This routine generates necessary code to initialize base classes and
diff --git a/clang/test/CIR/CodeGen/base-init-eh.cpp b/clang/test/CIR/CodeGen/base-init-eh.cpp
new file mode 100644
index 0000000000000..063a4d1dca977
--- /dev/null
+++ b/clang/test/CIR/CodeGen/base-init-eh.cpp
@@ -0,0 +1,129 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fexceptions -fcxx-exceptions -fclangir -emit-cir %s -o %t.cir
+// RUN: FileCheck --input-file=%t.cir %s --check-prefix=CIR
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fexceptions -fcxx-exceptions -fclangir -emit-llvm %s -o %t-cir.ll
+// RUN: FileCheck --input-file=%t-cir.ll %s --check-prefix=LLVM
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fexceptions -fcxx-exceptions -emit-llvm %s -o %t.ll
+// RUN: FileCheck --input-file=%t.ll %s --check-prefix=OGCG
+
+class Base {
+public:
+ Base(int);
+ ~Base();
+};
+
+void mayThrow();
+
+class Derived : public Base {
+public:
+ Derived() : Base(0) { mayThrow(); }
+};
+
+void test_base_initializer() {
+ Derived d;
+}
+
+// CIR: cir.func {{.*}} @_ZN7DerivedC2Ev
+// CIR: %[[THIS:.*]] = cir.load %{{.*}}
+// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base>
+// CIR: %[[ZERO:.*]] = cir.const #cir.int<0> : !s32i
+// CIR: cir.call @_ZN4BaseC2Ei(%[[BASE_ADDR]], %[[ZERO]])
+// CIR: cir.cleanup.scope {
+// CIR: cir.call @_Z8mayThrowv() : () -> ()
+// CIR: cir.yield
+// CIR: } cleanup eh {
+// CIR: cir.call @_ZN4BaseD2Ev(%[[BASE_ADDR]])
+// CIR: cir.yield
+// CIR: }
+
+// LLVM: define {{.*}} void @_ZN7DerivedC2Ev
+// LLVM: %[[THIS:.*]] = load ptr, ptr %{{.*}}
+// LLVM: call void @_ZN4BaseC2Ei(ptr {{.*}} %[[THIS]], i32 {{.*}} 0)
+// LLVM: invoke void @_Z8mayThrowv()
+// LLVM: to label %[[INVOKE_CONT:.*]] unwind label %[[LPAD:.*]]
+// LLVM: [[INVOKE_CONT:.*]]:
+// LLVM: br label %[[EXIT:.*]]
+// LLVM: [[LPAD:.*]]:
+// LLVM: %[[EXN:.*]] = landingpad { ptr, i32 }
+// LLVM: cleanup
+// LLVM: br label %[[EH_CLEANUP:.*]]
+// LLVM: [[EH_CLEANUP:.*]]:
+// LLVM: call void @_ZN4BaseD2Ev(ptr {{.*}} %[[THIS]])
+// LLVM: resume { ptr, i32 } %{{.*}}
+// LLVM: [[EXIT:.*]]:
+// LLVM: ret void
+
+// OGCG emits @_ZN7DerivedC2Ev below @_ZN11VirtDerivedC1Ev
+
+class VirtDerived : public virtual Base {
+public:
+ VirtDerived() : Base(0) { mayThrow(); }
+};
+
+void test_virt_base_initializer() {
+ VirtDerived v;
+}
+
+// CIR: cir.func {{.*}} @_ZN11VirtDerivedC1Ev
+// CIR: %[[THIS:.*]] = cir.load %{{.*}}
+// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_VirtDerived> nonnull [0] -> !cir.ptr<!rec_Base>
+// CIR: %[[ZERO:.*]] = cir.const #cir.int<0> : !s32i
+// CIR: cir.call @_ZN4BaseC2Ei(%[[BASE_ADDR]], %[[ZERO]])
+// CIR: cir.cleanup.scope {
+// CIR: %[[VTABLE_ADDR:.*]] = cir.vtable.address_point(@_ZTV11VirtDerived, address_point = <index = 0, offset = 3>) : !cir.vptr
+// CIR: %[[VTABLE_PTR:.*]] = cir.vtable.get_vptr %[[THIS]] : !cir.ptr<!rec_VirtDerived> -> !cir.ptr<!cir.vptr>
+// CIR: cir.store{{.*}} %[[VTABLE_ADDR]], %[[VTABLE_PTR]] : !cir.vptr, !cir.ptr<!cir.vptr>
+// CIR: cir.call @_Z8mayThrowv() : () -> ()
+// CIR: cir.yield
+// CIR: } cleanup eh {
+// CIR: cir.call @_ZN4BaseD2Ev(%[[BASE_ADDR]])
+// CIR: cir.yield
+// CIR: }
+
+// LLVM: define {{.*}} void @_ZN11VirtDerivedC1Ev
+// LLVM: %[[THIS:.*]] = load ptr, ptr %{{.*}}
+// LLVM: call void @_ZN4BaseC2Ei(ptr {{.*}} %[[THIS]], i32 {{.*}} 0)
+// LLVM: store ptr getelementptr inbounds nuw (i8, ptr @_ZTV11VirtDerived, i64 24), ptr %[[THIS]]
+// LLVM: invoke void @_Z8mayThrowv()
+// LLVM: to label %[[INVOKE_CONT:.*]] unwind label %[[LPAD:.*]]
+// LLVM: [[INVOKE_CONT:.*]]:
+// LLVM: br label %[[EXIT:.*]]
+// LLVM: [[LPAD:.*]]:
+// LLVM: %[[EXN:.*]] = landingpad { ptr, i32 }
+// LLVM: cleanup
+// LLVM: br label %[[EH_CLEANUP:.*]]
+// LLVM: [[EH_CLEANUP:.*]]:
+// LLVM: call void @_ZN4BaseD2Ev(ptr {{.*}} %[[THIS]])
+// LLVM: resume { ptr, i32 } %{{.*}}
+// LLVM: [[EXIT:.*]]:
+// LLVM: ret void
+
+// OGCG: define {{.*}} void @_ZN11VirtDerivedC1Ev
+// OGCG: %[[THIS:.*]] = load ptr, ptr %{{.*}}
+// OGCG: call void @_ZN4BaseC2Ei(ptr {{.*}} %[[THIS]], i32 {{.*}} 0)
+// OGCG: store ptr getelementptr inbounds inrange(-24, 0) ({ [3 x ptr] }, ptr @_ZTV11VirtDerived, i32 0, i32 0, i32 3), ptr %[[THIS]]
+// OGCG: invoke void @_Z8mayThrowv()
+// OGCG: to label %[[INVOKE_CONT:.*]] unwind label %[[LPAD:.*]]
+// OGCG: [[INVOKE_CONT:.*]]:
+// OGCG: ret void
+// OGCG: [[LPAD:.*]]:
+// OGCG: %[[EXN:.*]] = landingpad { ptr, i32 }
+// OGCG: cleanup
+// OGCG: call void @_ZN4BaseD2Ev(ptr {{.*}} %[[THIS]])
+// OGCG: br label %[[EH_RESUME:.*]]
+// OGCG: [[EH_RESUME:.*]]:
+// OGCG: resume { ptr, i32 } %{{.*}}
+
+// OGCG: define {{.*}} void @_ZN7DerivedC2Ev
+// OGCG: %[[THIS:.*]] = load ptr, ptr %{{.*}}
+// OGCG: call void @_ZN4BaseC2Ei(ptr {{.*}} %[[THIS]], i32 {{.*}} 0)
+// OGCG: invoke void @_Z8mayThrowv()
+// OGCG: to label %[[INVOKE_CONT:.*]] unwind label %[[LPAD:.*]]
+// OGCG: [[INVOKE_CONT:.*]]:
+// OGCG: ret void
+// OGCG: [[LPAD:.*]]:
+// OGCG: %[[EXN:.*]] = landingpad { ptr, i32 }
+// OGCG: cleanup
+// OGCG: call void @_ZN4BaseD2Ev(ptr {{.*}} %[[THIS]])
+// OGCG: br label %[[EH_RESUME:.*]]
+// OGCG: [[EH_RESUME:.*]]:
+// OGCG: resume { ptr, i32 } %{{.*}}
More information about the cfe-commits
mailing list