[CIR] Implement CXXScalarValueInitExpr for ComplexType #147143

AmrDeveloper · 2025-07-05T12:28:18Z

Implement CXXScalarValueInitExpr support for ComplexType

#141365

llvmbot · 2025-07-05T12:28:49Z

@llvm/pr-subscribers-clang

Author: Amr Hesham (AmrDeveloper)

Changes

Implement CXXScalarValueInitExpr support for ComplexType

#141365

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

2 Files Affected:

(modified) clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp (+12)
(modified) clang/test/CIR/CodeGen/complex.cpp (+18)

diff --git a/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp b/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp
index c000b225f31f3..48024b457f848 100644
--- a/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp
@@ -44,6 +44,7 @@ class ComplexExprEmitter : public StmtVisitor<ComplexExprEmitter, mlir::Value> {
   mlir::Value VisitBinComma(const BinaryOperator *e);
   mlir::Value VisitCallExpr(const CallExpr *e);
   mlir::Value VisitChooseExpr(ChooseExpr *e);
+  mlir::Value VisitCXXScalarValueInitExpr(CXXScalarValueInitExpr *e);
   mlir::Value VisitDeclRefExpr(DeclRefExpr *e);
   mlir::Value VisitGenericSelectionExpr(GenericSelectionExpr *e);
   mlir::Value VisitImplicitCastExpr(ImplicitCastExpr *e);
@@ -161,6 +162,17 @@ mlir::Value ComplexExprEmitter::VisitChooseExpr(ChooseExpr *e) {
   return Visit(e->getChosenSubExpr());
 }
 
+mlir::Value
+ComplexExprEmitter::VisitCXXScalarValueInitExpr(CXXScalarValueInitExpr *e) {
+  mlir::Location loc = cgf.getLoc(e->getExprLoc());
+  QualType complexElemTy =
+      e->getType()->castAs<clang::ComplexType>()->getElementType();
+  mlir::Type complexElemLLVMTy = cgf.convertType(complexElemTy);
+  mlir::TypedAttr defaultValue = builder.getZeroInitAttr(complexElemLLVMTy);
+  auto complexAttr = cir::ConstComplexAttr::get(defaultValue, defaultValue);
+  return builder.create<cir::ConstantOp>(loc, complexAttr);
+}
+
 mlir::Value ComplexExprEmitter::VisitDeclRefExpr(DeclRefExpr *e) {
   if (CIRGenFunction::ConstantEmission constant = cgf.tryEmitAsConstant(e))
     return emitConstant(constant, e);
diff --git a/clang/test/CIR/CodeGen/complex.cpp b/clang/test/CIR/CodeGen/complex.cpp
index 09e0ca03aa540..567fc40df6236 100644
--- a/clang/test/CIR/CodeGen/complex.cpp
+++ b/clang/test/CIR/CodeGen/complex.cpp
@@ -654,3 +654,21 @@ void foo26(int _Complex* a) {
 // OGCG: %[[B_IMAG_PTR:.*]] = getelementptr inbounds nuw { i32, i32 }, ptr %[[COMPLEX_B]], i32 0, i32 1
 // OGCG: store i32 %[[A_REAL]], ptr %[[B_REAL_PTR]], align 4
 // OGCG: store i32 %[[A_IMAG]], ptr %[[B_IMAG_PTR]], align 4
+
+void foo28() {
+  using IntComplex = int _Complex;
+  int _Complex a = IntComplex();
+}
+
+// CIR: %[[INIT:.*]] = cir.alloca !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>, ["a", init]
+// CIR: %[[COMPLEX:.*]] = cir.const #cir.const_complex<#cir.int<0> : !s32i, #cir.int<0> : !s32i> : !cir.complex<!s32i>
+// CIR: cir.store align(4) %[[COMPLEX]], %[[INIT]] : !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>
+
+// LLVM: %[[INIT:.*]] = alloca { i32, i32 }, i64 1, align 4
+// LLVM: store { i32, i32 } zeroinitializer, ptr %[[INIT]], align 4
+
+// OGCG: %[[INIT:.*]] = alloca { i32, i32 }, align 4
+// OGCG: %[[INIT_REAL_PTR:.*]] = getelementptr inbounds nuw { i32, i32 }, ptr %[[INIT]], i32 0, i32 0
+// OGCG: %[[INIT_IMAG_PTR:.*]] = getelementptr inbounds nuw { i32, i32 }, ptr %[[INIT]], i32 0, i32 1
+// OGCG: store i32 0, ptr %[[INIT_REAL_PTR]], align 4
+// OGCG: store i32 0, ptr %[[INIT_IMAG_PTR]], align 4

llvmbot · 2025-07-05T12:28:49Z

@llvm/pr-subscribers-clangir

Author: Amr Hesham (AmrDeveloper)

Changes

Implement CXXScalarValueInitExpr support for ComplexType

#141365

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

2 Files Affected:

(modified) clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp (+12)
(modified) clang/test/CIR/CodeGen/complex.cpp (+18)

diff --git a/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp b/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp
index c000b225f31f3..48024b457f848 100644
--- a/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp
@@ -44,6 +44,7 @@ class ComplexExprEmitter : public StmtVisitor<ComplexExprEmitter, mlir::Value> {
   mlir::Value VisitBinComma(const BinaryOperator *e);
   mlir::Value VisitCallExpr(const CallExpr *e);
   mlir::Value VisitChooseExpr(ChooseExpr *e);
+  mlir::Value VisitCXXScalarValueInitExpr(CXXScalarValueInitExpr *e);
   mlir::Value VisitDeclRefExpr(DeclRefExpr *e);
   mlir::Value VisitGenericSelectionExpr(GenericSelectionExpr *e);
   mlir::Value VisitImplicitCastExpr(ImplicitCastExpr *e);
@@ -161,6 +162,17 @@ mlir::Value ComplexExprEmitter::VisitChooseExpr(ChooseExpr *e) {
   return Visit(e->getChosenSubExpr());
 }
 
+mlir::Value
+ComplexExprEmitter::VisitCXXScalarValueInitExpr(CXXScalarValueInitExpr *e) {
+  mlir::Location loc = cgf.getLoc(e->getExprLoc());
+  QualType complexElemTy =
+      e->getType()->castAs<clang::ComplexType>()->getElementType();
+  mlir::Type complexElemLLVMTy = cgf.convertType(complexElemTy);
+  mlir::TypedAttr defaultValue = builder.getZeroInitAttr(complexElemLLVMTy);
+  auto complexAttr = cir::ConstComplexAttr::get(defaultValue, defaultValue);
+  return builder.create<cir::ConstantOp>(loc, complexAttr);
+}
+
 mlir::Value ComplexExprEmitter::VisitDeclRefExpr(DeclRefExpr *e) {
   if (CIRGenFunction::ConstantEmission constant = cgf.tryEmitAsConstant(e))
     return emitConstant(constant, e);
diff --git a/clang/test/CIR/CodeGen/complex.cpp b/clang/test/CIR/CodeGen/complex.cpp
index 09e0ca03aa540..567fc40df6236 100644
--- a/clang/test/CIR/CodeGen/complex.cpp
+++ b/clang/test/CIR/CodeGen/complex.cpp
@@ -654,3 +654,21 @@ void foo26(int _Complex* a) {
 // OGCG: %[[B_IMAG_PTR:.*]] = getelementptr inbounds nuw { i32, i32 }, ptr %[[COMPLEX_B]], i32 0, i32 1
 // OGCG: store i32 %[[A_REAL]], ptr %[[B_REAL_PTR]], align 4
 // OGCG: store i32 %[[A_IMAG]], ptr %[[B_IMAG_PTR]], align 4
+
+void foo28() {
+  using IntComplex = int _Complex;
+  int _Complex a = IntComplex();
+}
+
+// CIR: %[[INIT:.*]] = cir.alloca !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>, ["a", init]
+// CIR: %[[COMPLEX:.*]] = cir.const #cir.const_complex<#cir.int<0> : !s32i, #cir.int<0> : !s32i> : !cir.complex<!s32i>
+// CIR: cir.store align(4) %[[COMPLEX]], %[[INIT]] : !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>
+
+// LLVM: %[[INIT:.*]] = alloca { i32, i32 }, i64 1, align 4
+// LLVM: store { i32, i32 } zeroinitializer, ptr %[[INIT]], align 4
+
+// OGCG: %[[INIT:.*]] = alloca { i32, i32 }, align 4
+// OGCG: %[[INIT_REAL_PTR:.*]] = getelementptr inbounds nuw { i32, i32 }, ptr %[[INIT]], i32 0, i32 0
+// OGCG: %[[INIT_IMAG_PTR:.*]] = getelementptr inbounds nuw { i32, i32 }, ptr %[[INIT]], i32 0, i32 1
+// OGCG: store i32 0, ptr %[[INIT_REAL_PTR]], align 4
+// OGCG: store i32 0, ptr %[[INIT_IMAG_PTR]], align 4

bcardosolopes

LGTM after minor nit

bcardosolopes · 2025-07-07T18:20:58Z

clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp

+  mlir::Type complexElemLLVMTy = cgf.convertType(complexElemTy);
+  mlir::TypedAttr defaultValue = builder.getZeroInitAttr(complexElemLLVMTy);
+  auto complexAttr = cir::ConstComplexAttr::get(defaultValue, defaultValue);
+  return builder.create<cir::ConstantOp>(loc, complexAttr);


nit: inline the cir::ConstComplexAttr::get directly into the create call.

getZeroInitAttr also works with ComplexType that returns cir::ZeroAttr::get(complexType)

I guess that would be more appropriate use here?

And even nicer return builder.getNullValue(loc, complexType);

I used getNullValue, it's nicer and required some changes in CIRToLLVMConstantOpLowering::matchAndRewrite because previously we expected the value to be ConstComplexAttr, so I supported ZeroAttr too, I will backport this change after merging

xlauko · 2025-07-07T20:01:36Z

clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp

-  mlir::TypedAttr defaultValue = builder.getZeroInitAttr(complexElemLLVMTy);
-  auto complexAttr = cir::ConstComplexAttr::get(defaultValue, defaultValue);
-  return builder.create<cir::ConstantOp>(loc, complexAttr);
+  mlir::Type complexLLVMTy = cgf.convertType(e->getType());


I believe this is cir not llvm type. Rename to complexTy.

Yes, that's right, I will rename it

Thanks

andykaylor

Looks good after nits are addressed.

andykaylor · 2025-07-07T20:09:50Z

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

@@ -1044,10 +1044,19 @@ mlir::LogicalResult CIRToLLVMConstantOpLowering::matchAndRewrite(
                                               getTypeConverter()));
    return mlir::success();
  } else if (auto complexTy = mlir::dyn_cast<cir::ComplexType>(op.getType())) {
-    auto complexAttr = mlir::cast<cir::ConstComplexAttr>(op.getValue());
-    mlir::Type complexElemTy = complexTy.getElementType();
+    auto complexElemTy = complexTy.getElementType();


Don't use auto here.

AmrDeveloper requested review from xlauko, erichkeane and andykaylor July 5, 2025 12:28

AmrDeveloper requested review from lanza and bcardosolopes as code owners July 5, 2025 12:28

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

bcardosolopes approved these changes Jul 7, 2025

View reviewed changes

AmrDeveloper added 2 commits July 7, 2025 21:55

[CIR] Implement CXXScalarValueInitExpr for ComplexType

0605fc9

Replace creating cir::ConstComplexAttr with getNullValue

6633ffe

xlauko reviewed Jul 7, 2025

View reviewed changes

andykaylor approved these changes Jul 7, 2025

View reviewed changes

AmrDeveloper force-pushed the cir_complex_cxx_scalar_value_init branch from d19361b to 9a9db0c Compare July 7, 2025 20:13

Address code review comments

7732455

AmrDeveloper force-pushed the cir_complex_cxx_scalar_value_init branch from 9a9db0c to 7732455 Compare July 7, 2025 20:14

AmrDeveloper merged commit bbefd33 into llvm:main Jul 8, 2025
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[CIR] Implement CXXScalarValueInitExpr for ComplexType #147143

[CIR] Implement CXXScalarValueInitExpr for ComplexType #147143

Uh oh!

AmrDeveloper commented Jul 5, 2025

Uh oh!

llvmbot commented Jul 5, 2025

Uh oh!

llvmbot commented Jul 5, 2025

Uh oh!

bcardosolopes left a comment

Uh oh!

bcardosolopes Jul 7, 2025

Uh oh!

xlauko Jul 7, 2025

Uh oh!

xlauko Jul 7, 2025

Uh oh!

AmrDeveloper Jul 7, 2025

Uh oh!

xlauko Jul 7, 2025

Uh oh!

AmrDeveloper Jul 7, 2025

Uh oh!

andykaylor left a comment

Uh oh!

andykaylor Jul 7, 2025

Uh oh!

Uh oh!

Uh oh!

[CIR] Implement CXXScalarValueInitExpr for ComplexType #147143

[CIR] Implement CXXScalarValueInitExpr for ComplexType #147143

Uh oh!

Conversation

AmrDeveloper commented Jul 5, 2025

Uh oh!

llvmbot commented Jul 5, 2025

Uh oh!

llvmbot commented Jul 5, 2025

Uh oh!

bcardosolopes left a comment

Choose a reason for hiding this comment

Uh oh!

bcardosolopes Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

xlauko Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

xlauko Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

AmrDeveloper Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

xlauko Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

AmrDeveloper Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

andykaylor left a comment

Choose a reason for hiding this comment

Uh oh!

andykaylor Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!