[CIR] Add name for enum type in vtable #163612

moar55 · 2025-10-15T18:37:14Z

This commit adds the RTTI support for enum in the vtable.

Issue #163601

llvmbot · 2025-10-15T18:37:47Z

@llvm/pr-subscribers-clangir

Author: Omar Hossam (moar55)

Changes

This commit adds the RTTI support for enum in the vtable.

Full diff: https://github.com/llvm/llvm-project/pull/163612.diff

2 Files Affected:

(modified) clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp (+1-2)
(modified) clang/test/CIR/CodeGen/throws.cpp (+49)

diff --git a/clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp b/clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp
index 9bb1fe1d49a25..276675cbca5f5 100644
--- a/clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp
@@ -952,8 +952,7 @@ const char *vTableClassNameForType(const CIRGenModule &cgm, const Type *ty) {
     break;
 
   case Type::Enum:
-    cgm.errorNYI("VTableClassNameForType: Enum");
-    break;
+    return "_ZTVN10__cxxabiv116__enum_type_infoE";
 
   case Type::Record: {
     const CXXRecordDecl *rd =
diff --git a/clang/test/CIR/CodeGen/throws.cpp b/clang/test/CIR/CodeGen/throws.cpp
index 4255d436d4a32..f8aa965b1a4aa 100644
--- a/clang/test/CIR/CodeGen/throws.cpp
+++ b/clang/test/CIR/CodeGen/throws.cpp
@@ -144,3 +144,52 @@ void throw_complex_expr() {
 // OGCG: store float 0x3FF19999A0000000, ptr %[[EXCEPTION_REAL]], align 16
 // OGCG: store float 0x40019999A0000000, ptr %[[EXCEPTION_IMAG]], align 4
 // OGCG: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTICf, ptr null)
+
+
+void throw_enum_expr() {
+  enum Test {
+    TestA,
+    TestB
+  };
+  throw Test::TestA;
+}
+
+//CIR: %[[EXCEPTION_ADDR:.*]]  = cir.alloc.exception 4 -> !cir.ptr<!u32i>
+//CIR: %[[EXCEPTION_VALUE:.*]] = cir.const #cir.int<0> : !u32i
+//CIR: cir.store{{.*}} %[[EXCEPTION_VALUE]], %[[EXCEPTION_ADDR]] : !u32i, !cir.ptr<!u32i>
+//CIR: cir.throw %[[EXCEPTION_ADDR]] : !cir.ptr<!u32i>, @_ZTIZ15throw_enum_exprvE4Test
+//CIR: cir.unreachable
+
+//LLVM: %[[EXCEPTION_ADDR:.*]] = call ptr @__cxa_allocate_exception(i64 4)
+//LLVM: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16
+//LLVM: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTIZ15throw_enum_exprvE4Test, ptr null)
+//LLVM: unreachable
+
+//OGCG: %[[EXCEPTION_ADDR:.*]]  = call ptr @__cxa_allocate_exception(i64 4)
+//OGCG: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16
+//OGCG: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTIZ15throw_enum_exprvE4Test, ptr null)
+//OGCG: unreachable
+
+void throw_enum_class_expr() {
+  enum class Test {
+    TestA,
+    TestB
+  };
+  throw Test::TestA;
+}
+
+//CIR: %[[EXCEPTION_ADDR:.*]]  = cir.alloc.exception 4 -> !cir.ptr<!s32i>
+//CIR: %[[EXCEPTION_VALUE:.*]] = cir.const #cir.int<0> : !s32i
+//CIR: cir.store{{.*}} %[[EXCEPTION_VALUE]], %[[EXCEPTION_ADDR]] : !s32i, !cir.ptr<!s32i>
+//CIR: cir.throw %[[EXCEPTION_ADDR]] : !cir.ptr<!s32i>, @_ZTIZ21throw_enum_class_exprvE4Test
+//CIR: cir.unreachable
+
+//LLVM: %[[EXCEPTION_ADDR:.*]] = call ptr @__cxa_allocate_exception(i64 4)
+//LLVM: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16
+//LLVM: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTIZ21throw_enum_class_exprvE4Test, ptr null)
+//LLVM: unreachable
+
+//OGCG: %[[EXCEPTION_ADDR:.*]]  = call ptr @__cxa_allocate_exception(i64 4)
+//OGCG: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16
+//OGCG: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTIZ21throw_enum_class_exprvE4Test, ptr null)
+//OGCG: unreachable

llvmbot · 2025-10-15T18:37:48Z

@llvm/pr-subscribers-clang

Author: Omar Hossam (moar55)

Changes

This commit adds the RTTI support for enum in the vtable.

Full diff: https://github.com/llvm/llvm-project/pull/163612.diff

2 Files Affected:

(modified) clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp (+1-2)
(modified) clang/test/CIR/CodeGen/throws.cpp (+49)

diff --git a/clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp b/clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp
index 9bb1fe1d49a25..276675cbca5f5 100644
--- a/clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp
@@ -952,8 +952,7 @@ const char *vTableClassNameForType(const CIRGenModule &cgm, const Type *ty) {
     break;
 
   case Type::Enum:
-    cgm.errorNYI("VTableClassNameForType: Enum");
-    break;
+    return "_ZTVN10__cxxabiv116__enum_type_infoE";
 
   case Type::Record: {
     const CXXRecordDecl *rd =
diff --git a/clang/test/CIR/CodeGen/throws.cpp b/clang/test/CIR/CodeGen/throws.cpp
index 4255d436d4a32..f8aa965b1a4aa 100644
--- a/clang/test/CIR/CodeGen/throws.cpp
+++ b/clang/test/CIR/CodeGen/throws.cpp
@@ -144,3 +144,52 @@ void throw_complex_expr() {
 // OGCG: store float 0x3FF19999A0000000, ptr %[[EXCEPTION_REAL]], align 16
 // OGCG: store float 0x40019999A0000000, ptr %[[EXCEPTION_IMAG]], align 4
 // OGCG: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTICf, ptr null)
+
+
+void throw_enum_expr() {
+  enum Test {
+    TestA,
+    TestB
+  };
+  throw Test::TestA;
+}
+
+//CIR: %[[EXCEPTION_ADDR:.*]]  = cir.alloc.exception 4 -> !cir.ptr<!u32i>
+//CIR: %[[EXCEPTION_VALUE:.*]] = cir.const #cir.int<0> : !u32i
+//CIR: cir.store{{.*}} %[[EXCEPTION_VALUE]], %[[EXCEPTION_ADDR]] : !u32i, !cir.ptr<!u32i>
+//CIR: cir.throw %[[EXCEPTION_ADDR]] : !cir.ptr<!u32i>, @_ZTIZ15throw_enum_exprvE4Test
+//CIR: cir.unreachable
+
+//LLVM: %[[EXCEPTION_ADDR:.*]] = call ptr @__cxa_allocate_exception(i64 4)
+//LLVM: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16
+//LLVM: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTIZ15throw_enum_exprvE4Test, ptr null)
+//LLVM: unreachable
+
+//OGCG: %[[EXCEPTION_ADDR:.*]]  = call ptr @__cxa_allocate_exception(i64 4)
+//OGCG: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16
+//OGCG: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTIZ15throw_enum_exprvE4Test, ptr null)
+//OGCG: unreachable
+
+void throw_enum_class_expr() {
+  enum class Test {
+    TestA,
+    TestB
+  };
+  throw Test::TestA;
+}
+
+//CIR: %[[EXCEPTION_ADDR:.*]]  = cir.alloc.exception 4 -> !cir.ptr<!s32i>
+//CIR: %[[EXCEPTION_VALUE:.*]] = cir.const #cir.int<0> : !s32i
+//CIR: cir.store{{.*}} %[[EXCEPTION_VALUE]], %[[EXCEPTION_ADDR]] : !s32i, !cir.ptr<!s32i>
+//CIR: cir.throw %[[EXCEPTION_ADDR]] : !cir.ptr<!s32i>, @_ZTIZ21throw_enum_class_exprvE4Test
+//CIR: cir.unreachable
+
+//LLVM: %[[EXCEPTION_ADDR:.*]] = call ptr @__cxa_allocate_exception(i64 4)
+//LLVM: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16
+//LLVM: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTIZ21throw_enum_class_exprvE4Test, ptr null)
+//LLVM: unreachable
+
+//OGCG: %[[EXCEPTION_ADDR:.*]]  = call ptr @__cxa_allocate_exception(i64 4)
+//OGCG: store i32 0, ptr %[[EXCEPTION_ADDR]], align 16
+//OGCG: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTIZ21throw_enum_class_exprvE4Test, ptr null)
+//OGCG: unreachable

AmrDeveloper

Thanks for working on this

AmrDeveloper · 2025-10-15T18:40:53Z

clang/test/CIR/CodeGen/throws.cpp

 // OGCG: store float 0x3FF19999A0000000, ptr %[[EXCEPTION_REAL]], align 16
 // OGCG: store float 0x40019999A0000000, ptr %[[EXCEPTION_IMAG]], align 4
 // OGCG: call void @__cxa_throw(ptr %[[EXCEPTION_ADDR]], ptr @_ZTICf, ptr null)
+


Please remove this extra line

AmrDeveloper · 2025-10-15T18:41:09Z

clang/test/CIR/CodeGen/throws.cpp

+  throw Test::TestA;
+}
+
+//CIR: %[[EXCEPTION_ADDR:.*]]  = cir.alloc.exception 4 -> !cir.ptr<!u32i>


Suggested change

//CIR: %[[EXCEPTION_ADDR:.*]] = cir.alloc.exception 4 -> !cir.ptr<!u32i>

//CIR: %[[EXCEPTION_ADDR:.*]] = cir.alloc.exception 4 -> !cir.ptr<!u32i>

AmrDeveloper · 2025-10-15T18:41:39Z

clang/test/CIR/CodeGen/throws.cpp

+  throw Test::TestA;
+}
+
+//CIR: %[[EXCEPTION_ADDR:.*]]  = cir.alloc.exception 4 -> !cir.ptr<!s32i>


Suggested change

//CIR: %[[EXCEPTION_ADDR:.*]] = cir.alloc.exception 4 -> !cir.ptr<!s32i>

//CIR: %[[EXCEPTION_ADDR:.*]] = cir.alloc.exception 4 -> !cir.ptr<!s32i>

AmrDeveloper · 2025-10-15T18:42:09Z

clang/test/CIR/CodeGen/throws.cpp

+  throw Test::TestA;
+}
+
+//CIR: %[[EXCEPTION_ADDR:.*]]  = cir.alloc.exception 4 -> !cir.ptr<!u32i>


Please keep the same format of the test

//CIR : -> // CIR:

bcardosolopes

LGTM once @AmrDeveloper concerns are addressed!

AmrDeveloper

LGTM, Thanks!

moar55 requested review from andykaylor, bcardosolopes, lanza and xlauko as code owners October 15, 2025 18:37

llvmbot added clang Clang issues not falling into any other category ClangIR Anything related to the ClangIR project labels Oct 15, 2025

moar55 changed the title ~~#163601: Add name for enum type in vtable~~ [CIR] #163601: Add name for enum type in vtable Oct 15, 2025

moar55 changed the title ~~[CIR] #163601: Add name for enum type in vtable~~ [CIR]: Add name for enum type in vtable Oct 15, 2025

moar55 changed the title ~~[CIR]: Add name for enum type in vtable~~ [CIR] Add name for enum type in vtable Oct 15, 2025

AmrDeveloper requested changes Oct 15, 2025

View reviewed changes

bcardosolopes approved these changes Oct 17, 2025

View reviewed changes

moar55 added 2 commits October 17, 2025 09:46

[CIR]llvm#163601: Handle enum type

4590322

address comments

10e2373

moar55 force-pushed the support-enum-vtable-clangir branch from a21a9c2 to 10e2373 Compare October 17, 2025 07:47

AmrDeveloper approved these changes Oct 17, 2025

View reviewed changes

AmrDeveloper merged commit d6191b8 into llvm:main Oct 17, 2025
10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[CIR] Add name for enum type in vtable #163612

[CIR] Add name for enum type in vtable #163612

Uh oh!

moar55 commented Oct 15, 2025 •

edited

Loading

Uh oh!

llvmbot commented Oct 15, 2025

Uh oh!

llvmbot commented Oct 15, 2025

Uh oh!

AmrDeveloper left a comment

Uh oh!

AmrDeveloper Oct 15, 2025

Uh oh!

AmrDeveloper Oct 15, 2025

Uh oh!

AmrDeveloper Oct 15, 2025

Uh oh!

AmrDeveloper Oct 15, 2025

Uh oh!

bcardosolopes left a comment

Uh oh!

AmrDeveloper left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	//CIR: %[[EXCEPTION_ADDR:.*]] = cir.alloc.exception 4 -> !cir.ptr<!u32i>
	//CIR: %[[EXCEPTION_ADDR:.*]] = cir.alloc.exception 4 -> !cir.ptr<!u32i>

[CIR] Add name for enum type in vtable #163612

[CIR] Add name for enum type in vtable #163612

Uh oh!

Conversation

moar55 commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Oct 15, 2025

Uh oh!

llvmbot commented Oct 15, 2025

Uh oh!

AmrDeveloper left a comment

Choose a reason for hiding this comment

Uh oh!

AmrDeveloper Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

AmrDeveloper Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

AmrDeveloper Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

AmrDeveloper Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

bcardosolopes left a comment

Choose a reason for hiding this comment

Uh oh!

AmrDeveloper left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

moar55 commented Oct 15, 2025 •

edited

Loading