Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion clang/lib/CIR/Dialect/IR/CIRDialect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3854,7 +3854,10 @@ LogicalResult cir::StdInitializerListOp::verify() {
return emitOpError("first member type of std::initializer_list must be "
"'!cir.ptr', but provided ")
<< resultType.getMembers()[0];
auto expectedType = memberPtr.getPointee();
const mlir::Type templateType = memberPtr.getPointee();
const mlir::Type expectedType =
mlir::isa<cir::StructType, cir::ArrayType>(templateType) ? memberPtr
: templateType;
for (const mlir::Value &arg : getArgs())
if (expectedType != arg.getType())
return emitOpError("arg type must be ")
Expand Down
22 changes: 22 additions & 0 deletions clang/test/CIR/CodeGen/initlist-array.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// RUN: %clang_cc1 -triple aarch64-none-linux-android21 -fclangir -emit-cir %s -o %t.cir -clangir-disable-passes
// RUN: FileCheck --check-prefix=BEFORE --input-file=%t.cir %s

namespace std {
template <class b> class initializer_list {
const b *array_start;
const b *array_end;
};

} // namespace std

void f(std::initializer_list<int[2]>);
void test() {
f({{1,2},{1,2}});
}

// BEFORE: [[INITLIST_TYPE:!.*]] = !cir.struct<class "std::initializer_list<int[2]>" {!cir.ptr<!cir.array<!s32i x 2>>, !cir.ptr<!cir.array<!s32i x 2>>} #cir.record.decl.ast>
// BEFORE: %0 = cir.alloca !ty_std3A3Ainitializer_list3Cint5B25D3E, !cir.ptr<!ty_std3A3Ainitializer_list3Cint5B25D3E>, ["agg.tmp0"] {alignment = 8 : i64}
// BEFORE: %1 = cir.alloca !cir.array<!s32i x 2>, !cir.ptr<!cir.array<!s32i x 2>>, ["agg.tmp1"] {alignment = 4 : i64}
// BEFORE: %2 = cir.alloca !cir.array<!s32i x 2>, !cir.ptr<!cir.array<!s32i x 2>>, ["agg.tmp2"] {alignment = 4 : i64}
// ignore cir for array initialization
// BEFORE: cir.std.initializer_list %0 (%1, %2 : !cir.ptr<!cir.array<!s32i x 2>>, !cir.ptr<!cir.array<!s32i x 2>>) : !cir.ptr<[[INITLIST_TYPE]]>
24 changes: 24 additions & 0 deletions clang/test/CIR/CodeGen/initlist-record.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// RUN: %clang_cc1 -triple aarch64-none-linux-android21 -fclangir -emit-cir %s -o %t.cir -clangir-disable-passes
// RUN: FileCheck --check-prefix=BEFORE --input-file=%t.cir %s

namespace std {
template <class b> class initializer_list {
const b *array_start;
const b *array_end;
};

} // namespace std

struct A {};
void f(std::initializer_list<A>);
void test() {
f({A{},{}});
}

// BEFORE: [[INITLIST_TYPE:!.*]] = !cir.struct<class "std::initializer_list<A>" {!cir.ptr<!ty_A>, !cir.ptr<!ty_A>} #cir.record.decl.ast>
// BEFORE: %0 = cir.alloca [[INITLIST_TYPE]], !cir.ptr<[[INITLIST_TYPE]]>, ["agg.tmp0"] {alignment = 8 : i64}
// BEFORE: %1 = cir.alloca !ty_A, !cir.ptr<!ty_A>, ["agg.tmp1"] {alignment = 1 : i64}
// BEFORE: %2 = cir.alloca !ty_A, !cir.ptr<!ty_A>, ["agg.tmp2"] {alignment = 1 : i64}
// BEFORE: cir.std.initializer_list %0 (%1, %2 : !cir.ptr<!ty_A>, !cir.ptr<!ty_A>) : !cir.ptr<[[INITLIST_TYPE]]>
// BEFORE: %3 = cir.load %0 : !cir.ptr<[[INITLIST_TYPE]]>, [[INITLIST_TYPE]]
// BEFORE: cir.call @_Z1fSt16initializer_listI1AE(%3) : ([[INITLIST_TYPE]]) -> ()