[clang] [CIR] Add a temporary symbol table scope inside the inline inherited constructor helper (PR #239173)
Shrisha Kumar via cfe-commits
cfe-commits at lists.llvm.org
Thu Nov 5 20:50:05 PST 2026
https://github.com/Shrisha4real updated https://github.com/llvm/llvm-project/pull/239173
>From 08b6f65e18c0b8ae3dade0739e1ab607bb1e267b Mon Sep 17 00:00:00 2001
From: shrikuma <Shrisha.Kumar at amd.com>
Date: Thu, 5 Nov 2026 13:33:40 +0530
Subject: [PATCH 1/2] [CIR] Add a temporary symbol table scope inside the
inline inherited constructor helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Create a symbol table whenever that inline inherited constructor helper runs. it gives the synthetic `this` declaration’s symbol table entry a scope while CIRGen generates the constructor work.
---
clang/lib/CIR/CodeGen/CIRGenClass.cpp | 1 +
.../CIR/CodeGen/inherited-ctor-variadic-global.cpp | 12 ++++++++++++
2 files changed, 13 insertions(+)
create mode 100644 clang/test/CIR/CodeGen/inherited-ctor-variadic-global.cpp
diff --git a/clang/lib/CIR/CodeGen/CIRGenClass.cpp b/clang/lib/CIR/CodeGen/CIRGenClass.cpp
index 738f5464672435..4a944d88b2946b 100644
--- a/clang/lib/CIR/CodeGen/CIRGenClass.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenClass.cpp
@@ -1465,6 +1465,7 @@ void CIRGenFunction::emitInlinedInheritingCXXConstructorCall(
bool forVirtualBase, bool delegating, CallArgList &args) {
GlobalDecl gd(d, ctorType);
assert(!cir::MissingFeatures::generateDebugInfo());
+ SymTableScopeTy varScope(symbolTable);
InlinedInheritingConstructorScope scope(*this, gd);
RunCleanupsScope RunCleanups(*this);
diff --git a/clang/test/CIR/CodeGen/inherited-ctor-variadic-global.cpp b/clang/test/CIR/CodeGen/inherited-ctor-variadic-global.cpp
new file mode 100644
index 00000000000000..2033acbea21875
--- /dev/null
+++ b/clang/test/CIR/CodeGen/inherited-ctor-variadic-global.cpp
@@ -0,0 +1,12 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -emit-cir %s -o - | FileCheck %s
+
+struct A { A(...); };
+struct B : A { using A::A; };
+
+B b(4);
+
+// CHECK: cir.global external @b
+// CHECK-LABEL: cir.func internal private @__cxx_global_var_init()
+// CHECK: cir.get_global @b : !cir.ptr<!rec_B>
+// CHECK: cir.const #cir.int<4> : !s32i
+// CHECK: cir.call @_ZN1AC2Ez
>From 200962da75b984e5cb6ad872c9a4611b7d92b558 Mon Sep 17 00:00:00 2001
From: shrikuma <Shrisha.Kumar at amd.com>
Date: Fri, 6 Nov 2026 10:18:13 +0530
Subject: [PATCH 2/2] [CIR] Move variadic inherited-ctor global test into
inherited-ctors.cpp
---
.../inherited-ctor-variadic-global.cpp | 12 -----------
clang/test/CIR/CodeGen/inherited-ctors.cpp | 21 +++++++++++++++++++
2 files changed, 21 insertions(+), 12 deletions(-)
delete mode 100644 clang/test/CIR/CodeGen/inherited-ctor-variadic-global.cpp
diff --git a/clang/test/CIR/CodeGen/inherited-ctor-variadic-global.cpp b/clang/test/CIR/CodeGen/inherited-ctor-variadic-global.cpp
deleted file mode 100644
index 2033acbea21875..00000000000000
--- a/clang/test/CIR/CodeGen/inherited-ctor-variadic-global.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -emit-cir %s -o - | FileCheck %s
-
-struct A { A(...); };
-struct B : A { using A::A; };
-
-B b(4);
-
-// CHECK: cir.global external @b
-// CHECK-LABEL: cir.func internal private @__cxx_global_var_init()
-// CHECK: cir.get_global @b : !cir.ptr<!rec_B>
-// CHECK: cir.const #cir.int<4> : !s32i
-// CHECK: cir.call @_ZN1AC2Ez
diff --git a/clang/test/CIR/CodeGen/inherited-ctors.cpp b/clang/test/CIR/CodeGen/inherited-ctors.cpp
index 7145436b93c5ef..85e98c21fcfdd4 100644
--- a/clang/test/CIR/CodeGen/inherited-ctors.cpp
+++ b/clang/test/CIR/CodeGen/inherited-ctors.cpp
@@ -18,6 +18,11 @@ struct VirtDerived : virtual Base {
using Base::Base;
};
+struct VariadicBase { VariadicBase(...); };
+struct VariadicDerived : VariadicBase { using VariadicBase::VariadicBase; };
+
+VariadicDerived globalVariadic(4);
+
struct VirtualDelegatingCtor : VirtDerived {
VirtualDelegatingCtor(int x) : Base(x), VirtDerived(x){}
};
@@ -53,6 +58,22 @@ void inheritedFromVBase() {
}
+// CIR: cir.global external @globalVariadic
+// CIR-LABEL: cir.func internal private @__cxx_global_var_init()
+// CIR: %[[TMP_ALLOCA:.*]] = cir.alloca "tmp" {{.*}} : !cir.ptr<!cir.ptr<!rec_VariadicDerived>>
+// CIR: %[[GLOBAL:.*]] = cir.get_global @globalVariadic : !cir.ptr<!rec_VariadicDerived>
+// CIR: %[[FOUR:.*]] = cir.const #cir.int<4> : !s32i
+// CIR: cir.store align(8) %[[GLOBAL]], %[[TMP_ALLOCA]]
+// CIR: %[[TMP_LOAD:.*]] = cir.load %[[TMP_ALLOCA]]
+// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[TMP_LOAD]] [0] : !cir.ptr<!rec_VariadicDerived> -> !cir.ptr<!rec_VariadicBase>
+// CIR: cir.call @_ZN12VariadicBaseC2Ez(%[[BASE_ADDR]], %[[FOUR]]) : (!cir.ptr<!rec_VariadicBase>{{.*}}, !s32i{{.*}}) -> ()
+//
+// LLVM: @globalVariadic = global %struct.VariadicDerived zeroinitializer
+// LLVM-LABEL: define internal void @__cxx_global_var_init(){{.*}}
+// LLVM: store ptr @globalVariadic, ptr %[[TMP_ALLOCA:.*]], align 8
+// LLVM: %[[THIS:.*]] = load ptr, ptr %[[TMP_ALLOCA]]
+// LLVM: call void (ptr, ...) @_ZN12VariadicBaseC2Ez(ptr {{.*}}%[[THIS]], i32 {{.*}}4)
+//
// CIR-LABEL: cir.func no_inline dso_local @_Z20emitDelegateCallArgsv()
// CIR: cir.call @_ZN7DerivedCI14BaseEi(%{{.*}}, %{{.*}}) : (!cir.ptr<!rec_Derived>{{.*}}, !s32i{{.*}}) -> ()
// LLVM-LABEL: define dso_local void @_Z20emitDelegateCallArgsv()
More information about the cfe-commits
mailing list