https://github.com/Ankur-0429 updated
https://github.com/llvm/llvm-project/pull/136807
>From 44a384b8ad774939c7664c8a476e852f1d4a7341 Mon Sep 17 00:00:00 2001
From: Ankur Ahir <ankura...@google.com>
Date: Tue, 22 Apr 2025 20:04:34 -0700
Subject: [PATCH 01/11] Upstream enum support
---
clang/lib/CIR/CodeGen/CIRGenModule.cpp | 3 +++
clang/test/CIR/CodeGen/basic.c | 5 +++++
clang/test/CIR/CodeGen/basic.cpp | 5 +++++
3 files changed, 13 insertions(+)
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 3b13d495be5e3..79db25dda3fea 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -617,6 +617,9 @@ void CIRGenModule::emitTopLevelDecl(Decl *decl) {
case Decl::OpenACCDeclare:
emitGlobalOpenACCDecl(cast<OpenACCDeclareDecl>(decl));
break;
+ case Decl::Enum:
+ assert(!cir::MissingFeatures::generateDebugInfo() && "NYI");
+ break;
case Decl::Typedef:
case Decl::TypeAlias: // using foo = bar; [C++11]
diff --git a/clang/test/CIR/CodeGen/basic.c b/clang/test/CIR/CodeGen/basic.c
index 1845d3b64bf68..623aad778f0db 100644
--- a/clang/test/CIR/CodeGen/basic.c
+++ b/clang/test/CIR/CodeGen/basic.c
@@ -253,3 +253,8 @@ size_type max_size(void) {
// OGCG: define{{.*}} i64 @max_size()
// OGCG: ret i64 2305843009213693951
+
+enum {
+ um = 0,
+ dois = 1,
+};
\ No newline at end of file
diff --git a/clang/test/CIR/CodeGen/basic.cpp b/clang/test/CIR/CodeGen/basic.cpp
index 0f8431325a86f..c1c3e60079869 100644
--- a/clang/test/CIR/CodeGen/basic.cpp
+++ b/clang/test/CIR/CodeGen/basic.cpp
@@ -102,3 +102,8 @@ size_type max_size() {
// CHECK: %3 = cir.cast(integral, %2 : !s32i), !u64i
// CHECK: %4 = cir.const #cir.int<8> : !u64i
// CHECK: %5 = cir.binop(div, %3, %4) : !u64i
+
+enum {
+ um = 0,
+ dois = 1,
+};
\ No newline at end of file
>From 83240e84668fcef9dda04ac64d8c3b294a02e2ea Mon Sep 17 00:00:00 2001
From: Ankur Ahir <ankura...@google.com>
Date: Wed, 23 Apr 2025 19:12:12 -0700
Subject: [PATCH 02/11] resolving
https://github.com/llvm/llvm-project/pull/136807\#discussion_r2056609689
---
clang/lib/CIR/CodeGen/CIRGenModule.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 79db25dda3fea..f560692b705ab 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -618,9 +618,6 @@ void CIRGenModule::emitTopLevelDecl(Decl *decl) {
emitGlobalOpenACCDecl(cast<OpenACCDeclareDecl>(decl));
break;
case Decl::Enum:
- assert(!cir::MissingFeatures::generateDebugInfo() && "NYI");
- break;
-
case Decl::Typedef:
case Decl::TypeAlias: // using foo = bar; [C++11]
case Decl::Record:
>From e431b59ebf0d7702c8b66658b3fccedf411eb2bd Mon Sep 17 00:00:00 2001
From: Ankur Ahir <ankura...@google.com>
Date: Wed, 23 Apr 2025 19:14:13 -0700
Subject: [PATCH 03/11] resolving
https://github.com/llvm/llvm-project/pull/136807\#discussion_r2056780889
---
clang/test/CIR/CodeGen/basic.c | 2 +-
clang/test/CIR/CodeGen/basic.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/test/CIR/CodeGen/basic.c b/clang/test/CIR/CodeGen/basic.c
index 623aad778f0db..ccfa10412c2bc 100644
--- a/clang/test/CIR/CodeGen/basic.c
+++ b/clang/test/CIR/CodeGen/basic.c
@@ -257,4 +257,4 @@ size_type max_size(void) {
enum {
um = 0,
dois = 1,
-};
\ No newline at end of file
+};
diff --git a/clang/test/CIR/CodeGen/basic.cpp b/clang/test/CIR/CodeGen/basic.cpp
index c1c3e60079869..55735680991c9 100644
--- a/clang/test/CIR/CodeGen/basic.cpp
+++ b/clang/test/CIR/CodeGen/basic.cpp
@@ -106,4 +106,4 @@ size_type max_size() {
enum {
um = 0,
dois = 1,
-};
\ No newline at end of file
+};
>From f078a1c145922596eccfc89cd4c701a711772d2a Mon Sep 17 00:00:00 2001
From: Ankur Ahir <ankura...@google.com>
Date: Wed, 23 Apr 2025 20:37:54 -0700
Subject: [PATCH 04/11] resolving
https://github.com/llvm/llvm-project/pull/136807\#discussion_r2056613948
---
clang/lib/CIR/CodeGen/CIRGenTypes.cpp | 7 +++++++
clang/test/CIR/CodeGen/basic.c | 15 ++++++++++++---
clang/test/CIR/CodeGen/basic.cpp | 14 +++++++++++---
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
index b11f8466607f8..130b3107153ea 100644
--- a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
@@ -399,6 +399,13 @@ mlir::Type CIRGenTypes::convertType(QualType type) {
break;
}
+ case Type::Enum: {
+ const EnumDecl *ED = cast<EnumType>(ty)->getDecl();
+ if (ED->isCompleteDefinition() || ED->isFixed())
+ return convertType(ED->getIntegerType());
+ break;
+ }
+
case Type::FunctionNoProto:
case Type::FunctionProto:
resultType = convertFunctionTypeInternal(type);
diff --git a/clang/test/CIR/CodeGen/basic.c b/clang/test/CIR/CodeGen/basic.c
index ccfa10412c2bc..b02e25bf43f74 100644
--- a/clang/test/CIR/CodeGen/basic.c
+++ b/clang/test/CIR/CodeGen/basic.c
@@ -254,7 +254,16 @@ size_type max_size(void) {
// OGCG: define{{.*}} i64 @max_size()
// OGCG: ret i64 2305843009213693951
-enum {
- um = 0,
- dois = 1,
+enum A {
+ A_one,
+ A_two
};
+enum A a;
+
+// CHECK: cir.store %5, %0 : !u64i, !cir.ptr<!u64i>
+// CHECK: %6 = cir.load %0 : !cir.ptr<!u64i>, !u64i
+// CHECK: cir.return %6 : !u64i
+// CHECK: }
+// CHECK: cir.global external @a = #cir.int<0> : !u32i
+// CHECK: }
+
diff --git a/clang/test/CIR/CodeGen/basic.cpp b/clang/test/CIR/CodeGen/basic.cpp
index 55735680991c9..238239ab5d626 100644
--- a/clang/test/CIR/CodeGen/basic.cpp
+++ b/clang/test/CIR/CodeGen/basic.cpp
@@ -103,7 +103,15 @@ size_type max_size() {
// CHECK: %4 = cir.const #cir.int<8> : !u64i
// CHECK: %5 = cir.binop(div, %3, %4) : !u64i
-enum {
- um = 0,
- dois = 1,
+enum A {
+ A_one,
+ A_two
};
+A a;
+
+// CHECK: cir.store %5, %0 : !u64i, !cir.ptr<!u64i>
+// CHECK: %6 = cir.load %0 : !cir.ptr<!u64i>, !u64i
+// CHECK: cir.return %6 : !u64i
+// CHECK: }
+// CHECK: cir.global external @a = #cir.int<0> : !u32i
+// CHECK: }
>From 0854b2ffaffef5171d65e37dcf87e56e86aeb38b Mon Sep 17 00:00:00 2001
From: Ankur Ahir <ankura...@google.com>
Date: Wed, 23 Apr 2025 20:45:13 -0700
Subject: [PATCH 05/11] added default resulttype to enum decl
---
clang/lib/CIR/CodeGen/CIRGenTypes.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
index 130b3107153ea..c3f044731fa48 100644
--- a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
@@ -403,6 +403,7 @@ mlir::Type CIRGenTypes::convertType(QualType type) {
const EnumDecl *ED = cast<EnumType>(ty)->getDecl();
if (ED->isCompleteDefinition() || ED->isFixed())
return convertType(ED->getIntegerType());
+ resultType = cgm.UInt32Ty;
break;
}
>From 8d6a14326f57fc4dbc0964567161531eceb855c0 Mon Sep 17 00:00:00 2001
From: Ankur Ahir <ankura...@google.com>
Date: Wed, 23 Apr 2025 20:48:31 -0700
Subject: [PATCH 06/11] small formatting for basic.c
---
clang/test/CIR/CodeGen/basic.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/clang/test/CIR/CodeGen/basic.c b/clang/test/CIR/CodeGen/basic.c
index b02e25bf43f74..b90c2c52f1267 100644
--- a/clang/test/CIR/CodeGen/basic.c
+++ b/clang/test/CIR/CodeGen/basic.c
@@ -266,4 +266,3 @@ enum A a;
// CHECK: }
// CHECK: cir.global external @a = #cir.int<0> : !u32i
// CHECK: }
-
>From b911caff8da7641577e53697a2771300aa88ce31 Mon Sep 17 00:00:00 2001
From: Ankur Ahir <ankura...@google.com>
Date: Thu, 1 May 2025 19:43:53 -0700
Subject: [PATCH 07/11] resolving
https://github.com/llvm/llvm-project/pull/136807\#discussion_r2067667188
---
clang/include/clang/CIR/MissingFeatures.h | 1 +
clang/lib/CIR/CodeGen/CIRGenTypes.cpp | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/clang/include/clang/CIR/MissingFeatures.h
b/clang/include/clang/CIR/MissingFeatures.h
index 6bfc1199aea55..302602fd29f70 100644
--- a/clang/include/clang/CIR/MissingFeatures.h
+++ b/clang/include/clang/CIR/MissingFeatures.h
@@ -159,6 +159,7 @@ struct MissingFeatures {
static bool bitfields() { return false; }
static bool typeChecks() { return false; }
static bool lambdaFieldToName() { return false; }
+ static bool updateCompletedType() { return false; }
// Missing types
static bool dataMemberType() { return false; }
diff --git a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
index c3f044731fa48..540e27642d3bf 100644
--- a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
@@ -400,9 +400,14 @@ mlir::Type CIRGenTypes::convertType(QualType type) {
}
case Type::Enum: {
+ // TODO(cir): Implement updateCompletedType for enums.
+ assert(!cir.MissingFeatures::updateCompletedType());
const EnumDecl *ED = cast<EnumType>(ty)->getDecl();
if (ED->isCompleteDefinition() || ED->isFixed())
return convertType(ED->getIntegerType());
+ // Return a placeholder 'i32' type. This can be changed later when the
+ // type is defined (see UpdateCompletedType), but is likely to be the
+ // "right" answer.
resultType = cgm.UInt32Ty;
break;
}
>From a646570d9b98e658e2b370d5667e6298fe5754fb Mon Sep 17 00:00:00 2001
From: Ankur Ahir <69181589+ankur-0...@users.noreply.github.com>
Date: Sun, 11 May 2025 00:36:00 -0700
Subject: [PATCH 08/11] fixing up test cases after rebase
---
clang/test/CIR/CodeGen/basic.c | 28 +++++++++++++++++++++++-----
clang/test/CIR/CodeGen/basic.cpp | 30 ++++++++++++++++++++++++------
2 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/clang/test/CIR/CodeGen/basic.c b/clang/test/CIR/CodeGen/basic.c
index b90c2c52f1267..217025046acb6 100644
--- a/clang/test/CIR/CodeGen/basic.c
+++ b/clang/test/CIR/CodeGen/basic.c
@@ -253,6 +253,10 @@ size_type max_size(void) {
// OGCG: define{{.*}} i64 @max_size()
// OGCG: ret i64 2305843009213693951
+// CHECK: cir.store %5, %0 : !u64i, !cir.ptr<!u64i>
+// CHECK: %6 = cir.load %0 : !cir.ptr<!u64i>, !u64i
+// CHECK: cir.return %6 : !u64i
+// CHECK: }
enum A {
A_one,
@@ -260,9 +264,23 @@ enum A {
};
enum A a;
-// CHECK: cir.store %5, %0 : !u64i, !cir.ptr<!u64i>
-// CHECK: %6 = cir.load %0 : !cir.ptr<!u64i>, !u64i
-// CHECK: cir.return %6 : !u64i
-// CHECK: }
// CHECK: cir.global external @a = #cir.int<0> : !u32i
-// CHECK: }
+
+enum B : int;
+enum B b;
+
+// CHECK: cir.global external @b = #cir.int<0> : !u32i
+
+
+enum C : int {
+ C_one,
+ C_two
+};
+enum C c;
+
+// CHECK: cir.global external @c = #cir.int<0> : !u32i
+
+enum class D : int;
+enum D d;
+
+// CHECK: cir.global external @d = #cir.int<0> : !u32i
diff --git a/clang/test/CIR/CodeGen/basic.cpp b/clang/test/CIR/CodeGen/basic.cpp
index 238239ab5d626..da3c81ce50dc7 100644
--- a/clang/test/CIR/CodeGen/basic.cpp
+++ b/clang/test/CIR/CodeGen/basic.cpp
@@ -102,16 +102,34 @@ size_type max_size() {
// CHECK: %3 = cir.cast(integral, %2 : !s32i), !u64i
// CHECK: %4 = cir.const #cir.int<8> : !u64i
// CHECK: %5 = cir.binop(div, %3, %4) : !u64i
+// CHECK: cir.store %5, %0 : !u64i, !cir.ptr<!u64i>
+// CHECK: %6 = cir.load %0 : !cir.ptr<!u64i>, !u64i
+// CHECK: cir.return %6 : !u64i
+// CHECK: }
enum A {
A_one,
A_two
};
-A a;
+enum A a;
-// CHECK: cir.store %5, %0 : !u64i, !cir.ptr<!u64i>
-// CHECK: %6 = cir.load %0 : !cir.ptr<!u64i>, !u64i
-// CHECK: cir.return %6 : !u64i
-// CHECK: }
// CHECK: cir.global external @a = #cir.int<0> : !u32i
-// CHECK: }
+
+enum B : int;
+enum B b;
+
+// CHECK: cir.global external @b = #cir.int<0> : !u32i
+
+
+enum C : int {
+ C_one,
+ C_two
+};
+enum C c;
+
+// CHECK: cir.global external @c = #cir.int<0> : !u32i
+
+enum class D : int;
+enum D d;
+
+// CHECK: cir.global external @d = #cir.int<0> : !u32i
>From 885aeaa8832b9da14f6465689cd9398c66dd82c0 Mon Sep 17 00:00:00 2001
From: Ankur Ahir <69181589+ankur-0...@users.noreply.github.com>
Date: Sun, 11 May 2025 00:36:37 -0700
Subject: [PATCH 09/11] enum class only works for cpp files
---
clang/test/CIR/CodeGen/basic.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/clang/test/CIR/CodeGen/basic.c b/clang/test/CIR/CodeGen/basic.c
index 217025046acb6..916246eb6e661 100644
--- a/clang/test/CIR/CodeGen/basic.c
+++ b/clang/test/CIR/CodeGen/basic.c
@@ -279,8 +279,3 @@ enum C : int {
enum C c;
// CHECK: cir.global external @c = #cir.int<0> : !u32i
-
-enum class D : int;
-enum D d;
-
-// CHECK: cir.global external @d = #cir.int<0> : !u32i
>From 925a1d5f0020e8ecf07e54016a3d50e937fdae25 Mon Sep 17 00:00:00 2001
From: Ankur Ahir <69181589+ankur-0...@users.noreply.github.com>
Date: Sun, 11 May 2025 00:40:48 -0700
Subject: [PATCH 10/11] resolving
https://github.com/llvm/llvm-project/pull/136807/files\#r2072089909
---
clang/lib/CIR/CodeGen/CIRGenTypes.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
index 540e27642d3bf..97c616eb5fb1f 100644
--- a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
@@ -403,8 +403,8 @@ mlir::Type CIRGenTypes::convertType(QualType type) {
// TODO(cir): Implement updateCompletedType for enums.
assert(!cir.MissingFeatures::updateCompletedType());
const EnumDecl *ED = cast<EnumType>(ty)->getDecl();
- if (ED->isCompleteDefinition() || ED->isFixed())
- return convertType(ED->getIntegerType());
+ if (auto integerType = ED->getIntegerType(); !integerType.isNull())
+ return convertType(integerType);
// Return a placeholder 'i32' type. This can be changed later when the
// type is defined (see UpdateCompletedType), but is likely to be the
// "right" answer.
>From fc5f5a6fdf24782ec6ecb897516150819acb49c4 Mon Sep 17 00:00:00 2001
From: Ankur Ahir <69181589+ankur-0...@users.noreply.github.com>
Date: Sun, 11 May 2025 00:56:25 -0700
Subject: [PATCH 11/11] syntax fix
---
clang/lib/CIR/CodeGen/CIRGenTypes.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
index 97c616eb5fb1f..b5e596796fe77 100644
--- a/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenTypes.cpp
@@ -401,7 +401,7 @@ mlir::Type CIRGenTypes::convertType(QualType type) {
case Type::Enum: {
// TODO(cir): Implement updateCompletedType for enums.
- assert(!cir.MissingFeatures::updateCompletedType());
+ assert(!cir::MissingFeatures::updateCompletedType());
const EnumDecl *ED = cast<EnumType>(ty)->getDecl();
if (auto integerType = ED->getIntegerType(); !integerType.isNull())
return convertType(integerType);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
