Skip to content

Commit 23c8f00

Browse files
committed
[CIR] Prepare a 'this' for CXXDefaultInitExprs
1 parent c8187f6 commit 23c8f00

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

clang/lib/CIR/CodeGen/CIRGenExprAggregate.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,9 @@ void AggExprEmitter::visitCXXParenListOrInitListExpr(
826826
}
827827
}
828828

829+
// Prepare a 'this' for CXXDefaultInitExprs.
830+
CIRGenFunction::FieldConstructionScope fcScope(cgf, dest.getAddress());
831+
829832
LValue destLV = cgf.makeAddrLValue(dest.getAddress(), e->getType());
830833

831834
if (record->isUnion()) {

clang/test/CIR/CodeGen/struct-init.cpp

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,3 +230,28 @@ void init_expr(int a, int b, int c) {
230230
// OGCG: %[[C_PLUS_THREE:.*]] = add nsw i32 %[[C]], 3
231231
// OGCG: store i32 %[[C_PLUS_THREE]], ptr %[[S_C]]
232232
// OGCG: ret void
233+
234+
void cxx_default_init_with_struct_field() {
235+
struct Parent {
236+
struct {
237+
int a;
238+
} child;
239+
};
240+
Parent p = Parent{};
241+
}
242+
243+
// CIR: %[[P_ADDR:.*]] = cir.alloca !rec_Parent, !cir.ptr<!rec_Parent>, ["p", init]
244+
// CIR: %[[P_ELEM_0_PTR:.*]] = cir.get_member %[[P_ADDR]][0] {name = "child"} : !cir.ptr<!rec_Parent> -> !cir.ptr<!rec_anon2E0>
245+
// CIR: %[[CHILD_ELEM_0_PTR:.*]] = cir.get_member %[[P_ELEM_0_PTR]][0] {name = "a"} : !cir.ptr<!rec_anon2E0> -> !cir.ptr<!s32i>
246+
// CIR: %[[CONST_0:.*]] = cir.const #cir.int<0> : !s32i
247+
// CIR: cir.store{{.*}} %3, %[[CHILD_ELEM_0_PTR]] : !s32i, !cir.ptr<!s32i>
248+
249+
// TODO(cir): zero-initialize the padding
250+
251+
// LLVM: %[[P_ADDR:.*]] = alloca %struct.Parent, i64 1, align 4
252+
// LLVM: %[[P_ELEM_0_PTR:.*]] = getelementptr %struct.Parent, ptr %[[P_ADDR]], i32 0, i32 0
253+
// LLVM: %[[CHILD_ELEM_0_PTR:.*]] = getelementptr %struct.anon.0, ptr %[[P_ELEM_0_PTR]], i32 0, i32 0
254+
// LLVM: store i32 0, ptr %[[CHILD_ELEM_0_PTR]], align 4
255+
256+
// OGCG: %[[P_ADDR:.*]] = alloca %struct.Parent, align 4
257+
// OGCG: call void @llvm.memset.p0.i64(ptr align 4 %[[P_ADDR]], i8 0, i64 4, i1 false)

0 commit comments

Comments
 (0)