Skip to content

[CIR] Fix invalid alias name for dialect's struct types #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2022
Merged

[CIR] Fix invalid alias name for dialect's struct types #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions clang/include/clang/CIR/Dialect/IR/CIROps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,9 +1126,9 @@ def StructElementAddr : CIR_Op<"struct_element_addr"> {

Example:
```mlir
!22struct2EBar22 = type !cir.struct<"struct.Bar", i32, i8>
!ty_22struct2EBar22 = type !cir.struct<"struct.Bar", i32, i8>
...
%0 = cir.alloca !22struct2EBar22, cir.ptr <!22struct2EBar22>
%0 = cir.alloca !ty_22struct2EBar22, cir.ptr <!ty_22struct2EBar22>
...
%1 = cir.struct_element_addr %0, "Bar.a"
%2 = cir.load %1 : cir.ptr <int>, int
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/CIR/Dialect/IR/CIRDialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct CIROpAsmDialectInterface : public OpAsmDialectInterface {

AliasResult getAlias(Type type, raw_ostream &os) const final {
if (auto structType = type.dyn_cast<StructType>()) {
os << structType.getTypeName();
os << "ty_" << structType.getTypeName();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any change to parsing code, can you also add that? I'm a bit lost on how this is related to #22, perhaps you might want one PR so you can add tests all at once?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parsing is part of the general MLIR code, the failure is to parse a type alias https://mlir.llvm.org/docs/LangRef/#type-aliases which expect the alias name, that should start with a letter or underscode https://mlir.llvm.org/docs/LangRef/#identifiers-and-keywords.

The dialect just decide what to call those aliases, so the patch makes sure it is a valid name.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relationship with the other PR: to parse back a struct there were two issues, this one which relates to the name of the type alias generated; and the one in #22, that is about parsing the sequence of types that are part of the struct.

return AliasResult::OverridableAlias;
}

Expand Down
30 changes: 15 additions & 15 deletions clang/test/CIR/CodeGen/String.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,56 +18,56 @@ void test() {
}

// CHECK: cir.func linkonce_odr @_ZN6StringC2Ev
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!22class2EString22>
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!ty_22class2EString22>
// CHECK-NEXT: cir.store %arg0, %0
// CHECK-NEXT: %1 = cir.load %0
// CHECK-NEXT: %2 = "cir.struct_element_addr"(%0) {member_name = "storage"}
// CHECK-NEXT: %3 = cir.cst(#cir.null : !cir.ptr<i8>) : !cir.ptr<i8>
// CHECK-NEXT: cir.store %3, %2 : !cir.ptr<i8>, cir.ptr <!cir.ptr<i8>>
// CHECK-NEXT: %4 = "cir.struct_element_addr"(%0) {member_name = "size"} : (!cir.ptr<!cir.ptr<!22class2EString22>>) -> !cir.ptr<i64>
// CHECK-NEXT: %4 = "cir.struct_element_addr"(%0) {member_name = "size"} : (!cir.ptr<!cir.ptr<!ty_22class2EString22>>) -> !cir.ptr<i64>
// CHECK-NEXT: %5 = cir.cst(0 : i32) : i32
// CHECK-NEXT: %6 = cir.cast(integral, %5 : i32), i64
// CHECK-NEXT: cir.store %6, %4 : i64, cir.ptr <i64>
// CHECK-NEXT: cir.return
// CHECK-NEXT: }
// CHECK: cir.func linkonce_odr @_ZN6StringC2Ei
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!22class2EString22>
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!ty_22class2EString22>
// CHECK-NEXT: %1 = cir.alloca i32, cir.ptr <i32>, ["size", init]
// CHECK-NEXT: cir.store %arg0, %0
// CHECK-NEXT: cir.store %arg1, %1
// CHECK-NEXT: %2 = cir.load %0
// CHECK-NEXT: %3 = "cir.struct_element_addr"(%0) {member_name = "storage"}
// CHECK-NEXT: %4 = cir.cst(#cir.null : !cir.ptr<i8>)
// CHECK-NEXT: cir.store %4, %3
// CHECK-NEXT: %5 = "cir.struct_element_addr"(%0) {member_name = "size"} : (!cir.ptr<!cir.ptr<!22class2EString22>>) -> !cir.ptr<i64>
// CHECK-NEXT: %5 = "cir.struct_element_addr"(%0) {member_name = "size"} : (!cir.ptr<!cir.ptr<!ty_22class2EString22>>) -> !cir.ptr<i64>
// CHECK-NEXT: %6 = cir.load %1 : cir.ptr <i32>, i32
// CHECK-NEXT: %7 = cir.cast(integral, %6 : i32), i64
// CHECK-NEXT: cir.store %7, %5 : i64, cir.ptr <i64>
// CHECK-NEXT: cir.return
// CHECK-NEXT: }

// CHECK: cir.func linkonce_odr @_ZN6StringC2EPKc
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!22class2EString22>, cir.ptr <!cir.ptr<!22class2EString22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!ty_22class2EString22>, cir.ptr <!cir.ptr<!ty_22class2EString22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: %1 = cir.alloca !cir.ptr<i8>, cir.ptr <!cir.ptr<i8>>, ["s", init] {alignment = 8 : i64}
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!22class2EString22>, cir.ptr <!cir.ptr<!22class2EString22>>
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!ty_22class2EString22>, cir.ptr <!cir.ptr<!ty_22class2EString22>>
// CHECK-NEXT: cir.store %arg1, %1 : !cir.ptr<i8>, cir.ptr <!cir.ptr<i8>>
// CHECK-NEXT: %2 = cir.load %0 : cir.ptr <!cir.ptr<!22class2EString22>>, !cir.ptr<!22class2EString22>
// CHECK-NEXT: %3 = "cir.struct_element_addr"(%0) {member_name = "storage"} : (!cir.ptr<!cir.ptr<!22class2EString22>>) -> !cir.ptr<!cir.ptr<i8>>
// CHECK-NEXT: %2 = cir.load %0 : cir.ptr <!cir.ptr<!ty_22class2EString22>>, !cir.ptr<!ty_22class2EString22>
// CHECK-NEXT: %3 = "cir.struct_element_addr"(%0) {member_name = "storage"} : (!cir.ptr<!cir.ptr<!ty_22class2EString22>>) -> !cir.ptr<!cir.ptr<i8>>
// CHECK-NEXT: %4 = cir.cst(#cir.null : !cir.ptr<i8>) : !cir.ptr<i8>
// CHECK-NEXT: cir.store %4, %3 : !cir.ptr<i8>, cir.ptr <!cir.ptr<i8>>
// CHECK-NEXT: cir.return

// CHECK: cir.func linkonce_odr @_ZN6StringC1EPKc
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!22class2EString22>, cir.ptr <!cir.ptr<!22class2EString22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!ty_22class2EString22>, cir.ptr <!cir.ptr<!ty_22class2EString22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: %1 = cir.alloca !cir.ptr<i8>, cir.ptr <!cir.ptr<i8>>, ["s", init] {alignment = 8 : i64}
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!22class2EString22>, cir.ptr <!cir.ptr<!22class2EString22>>
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!ty_22class2EString22>, cir.ptr <!cir.ptr<!ty_22class2EString22>>
// CHECK-NEXT: cir.store %arg1, %1 : !cir.ptr<i8>, cir.ptr <!cir.ptr<i8>>
// CHECK-NEXT: %2 = cir.load %0 : cir.ptr <!cir.ptr<!22class2EString22>>, !cir.ptr<!22class2EString22>
// CHECK-NEXT: %2 = cir.load %0 : cir.ptr <!cir.ptr<!ty_22class2EString22>>, !cir.ptr<!ty_22class2EString22>
// CHECK-NEXT: %3 = cir.load %1 : cir.ptr <!cir.ptr<i8>>, !cir.ptr<i8>
// CHECK-NEXT: cir.call @_ZN6StringC2EPKc(%2, %3) : (!cir.ptr<!22class2EString22>, !cir.ptr<i8>) -> ()
// CHECK-NEXT: cir.call @_ZN6StringC2EPKc(%2, %3) : (!cir.ptr<!ty_22class2EString22>, !cir.ptr<i8>) -> ()
// CHECK-NEXT: cir.return

// CHECK: cir.func @_Z4testv() {
// CHECK: cir.call @_ZN6StringC1Ev(%0) : (!cir.ptr<!22class2EString22>) -> ()
// CHECK: cir.call @_ZN6StringC1Ei(%1, %3) : (!cir.ptr<!22class2EString22>, i32) -> ()
// CHECK: cir.call @_ZN6StringC1EPKc(%2, %5) : (!cir.ptr<!22class2EString22>, !cir.ptr<i8>) -> ()
// CHECK: cir.call @_ZN6StringC1Ev(%0) : (!cir.ptr<!ty_22class2EString22>) -> ()
// CHECK: cir.call @_ZN6StringC1Ei(%1, %3) : (!cir.ptr<!ty_22class2EString22>, i32) -> ()
// CHECK: cir.call @_ZN6StringC1EPKc(%2, %5) : (!cir.ptr<!ty_22class2EString22>, !cir.ptr<i8>) -> ()
48 changes: 24 additions & 24 deletions clang/test/CIR/CodeGen/assign-operator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,39 @@ struct String {
// StringView::StringView(String const&)
//
// CHECK: cir.func linkonce_odr @_ZN10StringViewC2ERK6String
// CHECK: %0 = cir.alloca !cir.ptr<!22struct2EStringView22>, cir.ptr <!cir.ptr<!22struct2EStringView22>>, ["this", init] {alignment = 8 : i64}
// CHECK: %1 = cir.alloca !cir.ptr<!22struct2EString22>, cir.ptr <!cir.ptr<!22struct2EString22>>, ["s", init] {alignment = 8 : i64}
// CHECK: cir.store %arg0, %0 : !cir.ptr<!22struct2EStringView22>
// CHECK: cir.store %arg1, %1 : !cir.ptr<!22struct2EString22>
// CHECK: %2 = cir.load %0 : cir.ptr <!cir.ptr<!22struct2EStringView22>>
// CHECK: %0 = cir.alloca !cir.ptr<!ty_22struct2EStringView22>, cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>, ["this", init] {alignment = 8 : i64}
// CHECK: %1 = cir.alloca !cir.ptr<!ty_22struct2EString22>, cir.ptr <!cir.ptr<!ty_22struct2EString22>>, ["s", init] {alignment = 8 : i64}
// CHECK: cir.store %arg0, %0 : !cir.ptr<!ty_22struct2EStringView22>
// CHECK: cir.store %arg1, %1 : !cir.ptr<!ty_22struct2EString22>
// CHECK: %2 = cir.load %0 : cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>
// CHECK: %3 = "cir.struct_element_addr"(%0) {member_name = "size"}
// CHECK: %4 = cir.load %1 : cir.ptr <!cir.ptr<!22struct2EString22>>
// CHECK: %4 = cir.load %1 : cir.ptr <!cir.ptr<!ty_22struct2EString22>>
// CHECK: %5 = "cir.struct_element_addr"(%0) {member_name = "size"}
// CHECK: %6 = cir.load %5 : cir.ptr <i64>, i64
// CHECK: cir.store %6, %3 : i64, cir.ptr <i64>
// CHECK: cir.return
// CHECK: }

// DISABLE: cir.func linkonce_odr @_ZN10StringViewC2ERK6String
// DISABLE-NEXT: %0 = cir.alloca !cir.ptr<!22struct2EStringView22>, cir.ptr <!cir.ptr<!22struct2EStringView22>>, ["this", init] {alignment = 8 : i64}
// DISABLE-NEXT: %0 = cir.alloca !cir.ptr<!ty_22struct2EStringView22>, cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>, ["this", init] {alignment = 8 : i64}

// StringView::operator=(StringView&&)
//
// CHECK: cir.func linkonce_odr @_ZN10StringViewaSEOS_
// CHECK: %0 = cir.alloca !cir.ptr<!22struct2EStringView22>, cir.ptr <!cir.ptr<!22struct2EStringView22>>, ["this", init] {alignment = 8 : i64}
// CHECK: %1 = cir.alloca !cir.ptr<!22struct2EStringView22>, cir.ptr <!cir.ptr<!22struct2EStringView22>>, ["", init] {alignment = 8 : i64}
// CHECK: %2 = cir.alloca !cir.ptr<!22struct2EStringView22>, cir.ptr <!cir.ptr<!22struct2EStringView22>>, ["__retval"] {alignment = 8 : i64}
// CHECK: cir.store %arg0, %0 : !cir.ptr<!22struct2EStringView22>
// CHECK: cir.store %arg1, %1 : !cir.ptr<!22struct2EStringView22>
// CHECK: %3 = cir.load deref %0 : cir.ptr <!cir.ptr<!22struct2EStringView22>>
// CHECK: %4 = cir.load %1 : cir.ptr <!cir.ptr<!22struct2EStringView22>>
// CHECK: %0 = cir.alloca !cir.ptr<!ty_22struct2EStringView22>, cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>, ["this", init] {alignment = 8 : i64}
// CHECK: %1 = cir.alloca !cir.ptr<!ty_22struct2EStringView22>, cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>, ["", init] {alignment = 8 : i64}
// CHECK: %2 = cir.alloca !cir.ptr<!ty_22struct2EStringView22>, cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>, ["__retval"] {alignment = 8 : i64}
// CHECK: cir.store %arg0, %0 : !cir.ptr<!ty_22struct2EStringView22>
// CHECK: cir.store %arg1, %1 : !cir.ptr<!ty_22struct2EStringView22>
// CHECK: %3 = cir.load deref %0 : cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>
// CHECK: %4 = cir.load %1 : cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>
// CHECK: %5 = "cir.struct_element_addr"(%0) {member_name = "size"}
// CHECK: %6 = cir.load %5 : cir.ptr <i64>, i64
// CHECK: %7 = "cir.struct_element_addr"(%0) {member_name = "size"}
// CHECK: cir.store %6, %7 : i64, cir.ptr <i64>
// CHECK: cir.store %3, %2 : !cir.ptr<!22struct2EStringView22>
// CHECK: %8 = cir.load %2 : cir.ptr <!cir.ptr<!22struct2EStringView22>>
// CHECK: cir.return %8 : !cir.ptr<!22struct2EStringView22>
// CHECK: cir.store %3, %2 : !cir.ptr<!ty_22struct2EStringView22>
// CHECK: %8 = cir.load %2 : cir.ptr <!cir.ptr<!ty_22struct2EStringView22>>
// CHECK: cir.return %8 : !cir.ptr<!ty_22struct2EStringView22>
// CHECK: }

// DISABLE: cir.func @_ZN10StringViewaSEOS_
Expand All @@ -68,16 +68,16 @@ int main() {

// CHECK: cir.func @main() -> i32 {
// CHECK: %0 = cir.alloca i32, cir.ptr <i32>, ["__retval"] {alignment = 4 : i64}
// CHECK: %1 = cir.alloca !22struct2EStringView22, cir.ptr <!22struct2EStringView22>, ["sv"] {alignment = 8 : i64}
// CHECK: cir.call @_ZN10StringViewC2Ev(%1) : (!cir.ptr<!22struct2EStringView22>) -> ()
// CHECK: %1 = cir.alloca !ty_22struct2EStringView22, cir.ptr <!ty_22struct2EStringView22>, ["sv"] {alignment = 8 : i64}
// CHECK: cir.call @_ZN10StringViewC2Ev(%1) : (!cir.ptr<!ty_22struct2EStringView22>) -> ()
// CHECK: cir.scope {
// CHECK: %3 = cir.alloca !22struct2EString22, cir.ptr <!22struct2EString22>, ["s"] {alignment = 8 : i64}
// CHECK: %4 = cir.alloca !22struct2EStringView22, cir.ptr <!22struct2EStringView22>, ["ref.tmp"] {alignment = 8 : i64}
// CHECK: %3 = cir.alloca !ty_22struct2EString22, cir.ptr <!ty_22struct2EString22>, ["s"] {alignment = 8 : i64}
// CHECK: %4 = cir.alloca !ty_22struct2EStringView22, cir.ptr <!ty_22struct2EStringView22>, ["ref.tmp"] {alignment = 8 : i64}
// CHECK: %5 = cir.get_global @".str" : cir.ptr <!cir.array<i8 x 3>>
// CHECK: %6 = cir.cast(array_to_ptrdecay, %5 : !cir.ptr<!cir.array<i8 x 3>>), !cir.ptr<i8>
// CHECK: cir.call @_ZN6StringC2EPKc(%3, %6) : (!cir.ptr<!22struct2EString22>, !cir.ptr<i8>) -> ()
// CHECK: cir.call @_ZN10StringViewC2ERK6String(%4, %3) : (!cir.ptr<!22struct2EStringView22>, !cir.ptr<!22struct2EString22>) -> ()
// CHECK: %7 = cir.call @_ZN10StringViewaSEOS_(%1, %4) : (!cir.ptr<!22struct2EStringView22>, !cir.ptr<!22struct2EStringView22>) -> !cir.ptr<!22struct2EStringView22>
// CHECK: cir.call @_ZN6StringC2EPKc(%3, %6) : (!cir.ptr<!ty_22struct2EString22>, !cir.ptr<i8>) -> ()
// CHECK: cir.call @_ZN10StringViewC2ERK6String(%4, %3) : (!cir.ptr<!ty_22struct2EStringView22>, !cir.ptr<!ty_22struct2EString22>) -> ()
// CHECK: %7 = cir.call @_ZN10StringViewaSEOS_(%1, %4) : (!cir.ptr<!ty_22struct2EStringView22>, !cir.ptr<!ty_22struct2EStringView22>) -> !cir.ptr<!ty_22struct2EStringView22>
// CHECK: }
// CHECK: %2 = cir.load %0 : cir.ptr <i32>, i32
// CHECK: cir.return %2 : i32
Expand Down
10 changes: 5 additions & 5 deletions clang/test/CIR/CodeGen/ctor-alias.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ void t() {
}

// CHECK: cir.func linkonce_odr @_ZN11DummyStringC2EPKc
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!22struct2EDummyString22>, cir.ptr <!cir.ptr<!22struct2EDummyString22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!ty_22struct2EDummyString22>, cir.ptr <!cir.ptr<!ty_22struct2EDummyString22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: %1 = cir.alloca !cir.ptr<i8>, cir.ptr <!cir.ptr<i8>>, ["s", init] {alignment = 8 : i64}
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!22struct2EDummyString22>, cir.ptr <!cir.ptr<!22struct2EDummyString22>>
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!ty_22struct2EDummyString22>, cir.ptr <!cir.ptr<!ty_22struct2EDummyString22>>
// CHECK-NEXT: cir.store %arg1, %1 : !cir.ptr<i8>, cir.ptr <!cir.ptr<i8>>
// CHECK-NEXT: %2 = cir.load %0 : cir.ptr <!cir.ptr<!22struct2EDummyString22>>, !cir.ptr<!22struct2EDummyString22>
// CHECK-NEXT: %2 = cir.load %0 : cir.ptr <!cir.ptr<!ty_22struct2EDummyString22>>, !cir.ptr<!ty_22struct2EDummyString22>
// CHECK-NEXT: cir.return

// CHECK-NOT: cir.fun @_ZN11DummyStringC1EPKc

// CHECK: cir.func @_Z1tv
// CHECK-NEXT: %0 = cir.alloca !22struct2EDummyString22, cir.ptr <!22struct2EDummyString22>, ["s4"] {alignment = 1 : i64}
// CHECK-NEXT: %0 = cir.alloca !ty_22struct2EDummyString22, cir.ptr <!ty_22struct2EDummyString22>, ["s4"] {alignment = 1 : i64}
// CHECK-NEXT: %1 = cir.get_global @".str" : cir.ptr <!cir.array<i8 x 5>>
// CHECK-NEXT: %2 = cir.cast(array_to_ptrdecay, %1 : !cir.ptr<!cir.array<i8 x 5>>), !cir.ptr<i8>
// CHECK-NEXT: cir.call @_ZN11DummyStringC2EPKc(%0, %2) : (!cir.ptr<!22struct2EDummyString22>, !cir.ptr<i8>) -> ()
// CHECK-NEXT: cir.call @_ZN11DummyStringC2EPKc(%0, %2) : (!cir.ptr<!ty_22struct2EDummyString22>, !cir.ptr<i8>) -> ()
// CHECK-NEXT: cir.return
12 changes: 6 additions & 6 deletions clang/test/CIR/CodeGen/ctor-member-lvalue-to-rvalue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ struct String {
long size;
String(const String &s) : size{s.size} {}
// CHECK: cir.func linkonce_odr @_ZN6StringC2ERKS_
// CHECK: %0 = cir.alloca !cir.ptr<!22struct2EString22>, cir.ptr <!cir.ptr<!22struct2EString22>>, ["this", init] {alignment = 8 : i64}
// CHECK: %1 = cir.alloca !cir.ptr<!22struct2EString22>, cir.ptr <!cir.ptr<!22struct2EString22>>, ["s", init] {alignment = 8 : i64}
// CHECK: %0 = cir.alloca !cir.ptr<!ty_22struct2EString22>, cir.ptr <!cir.ptr<!ty_22struct2EString22>>, ["this", init] {alignment = 8 : i64}
// CHECK: %1 = cir.alloca !cir.ptr<!ty_22struct2EString22>, cir.ptr <!cir.ptr<!ty_22struct2EString22>>, ["s", init] {alignment = 8 : i64}
// CHECK: cir.store %arg0, %0
// CHECK: cir.store %arg1, %1
// CHECK: %2 = cir.load %0
Expand All @@ -28,10 +28,10 @@ void foo() {
// FIXME: s1 shouldn't be uninitialized.

// cir.func @_Z3foov() {
// %0 = cir.alloca !22struct2EString22, cir.ptr <!22struct2EString22>, ["s"] {alignment = 8 : i64}
// %1 = cir.alloca !22struct2EString22, cir.ptr <!22struct2EString22>, ["s1"] {alignment = 8 : i64}
// cir.call @_ZN6StringC2Ev(%0) : (!cir.ptr<!22struct2EString22>) -> ()
// cir.call @_ZN6StringC2ERKS_(%1, %0) : (!cir.ptr<!22struct2EString22>, !cir.ptr<!22struct2EString22>) -> ()
// %0 = cir.alloca !ty_22struct2EString22, cir.ptr <!ty_22struct2EString22>, ["s"] {alignment = 8 : i64}
// %1 = cir.alloca !ty_22struct2EString22, cir.ptr <!ty_22struct2EString22>, ["s1"] {alignment = 8 : i64}
// cir.call @_ZN6StringC2Ev(%0) : (!cir.ptr<!ty_22struct2EString22>) -> ()
// cir.call @_ZN6StringC2ERKS_(%1, %0) : (!cir.ptr<!ty_22struct2EString22>, !cir.ptr<!ty_22struct2EString22>) -> ()
// cir.return
// }
}
24 changes: 12 additions & 12 deletions clang/test/CIR/CodeGen/ctor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ void baz() {
Struk s;
}

// CHECK: !22struct2EStruk22 = !cir.struct<"struct.Struk", i32>
// CHECK: !ty_22struct2EStruk22 = !cir.struct<"struct.Struk", i32>

// CHECK: cir.func linkonce_odr @_ZN5StrukC2Ev(%arg0: !cir.ptr<!22struct2EStruk22>
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!22struct2EStruk22>, cir.ptr <!cir.ptr<!22struct2EStruk22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!22struct2EStruk22>, cir.ptr <!cir.ptr<!22struct2EStruk22>>
// CHECK-NEXT: %1 = cir.load %0 : cir.ptr <!cir.ptr<!22struct2EStruk22>>, !cir.ptr<!22struct2EStruk22>
// CHECK: cir.func linkonce_odr @_ZN5StrukC2Ev(%arg0: !cir.ptr<!ty_22struct2EStruk22>
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!ty_22struct2EStruk22>, cir.ptr <!cir.ptr<!ty_22struct2EStruk22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!ty_22struct2EStruk22>, cir.ptr <!cir.ptr<!ty_22struct2EStruk22>>
// CHECK-NEXT: %1 = cir.load %0 : cir.ptr <!cir.ptr<!ty_22struct2EStruk22>>, !cir.ptr<!ty_22struct2EStruk22>
// CHECK-NEXT: cir.return

// CHECK: cir.func linkonce_odr @_ZN5StrukC1Ev(%arg0: !cir.ptr<!22struct2EStruk22>
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!22struct2EStruk22>, cir.ptr <!cir.ptr<!22struct2EStruk22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!22struct2EStruk22>, cir.ptr <!cir.ptr<!22struct2EStruk22>>
// CHECK-NEXT: %1 = cir.load %0 : cir.ptr <!cir.ptr<!22struct2EStruk22>>, !cir.ptr<!22struct2EStruk22>
// CHECK-NEXT: cir.call @_ZN5StrukC2Ev(%1) : (!cir.ptr<!22struct2EStruk22>) -> ()
// CHECK: cir.func linkonce_odr @_ZN5StrukC1Ev(%arg0: !cir.ptr<!ty_22struct2EStruk22>
// CHECK-NEXT: %0 = cir.alloca !cir.ptr<!ty_22struct2EStruk22>, cir.ptr <!cir.ptr<!ty_22struct2EStruk22>>, ["this", init] {alignment = 8 : i64}
// CHECK-NEXT: cir.store %arg0, %0 : !cir.ptr<!ty_22struct2EStruk22>, cir.ptr <!cir.ptr<!ty_22struct2EStruk22>>
// CHECK-NEXT: %1 = cir.load %0 : cir.ptr <!cir.ptr<!ty_22struct2EStruk22>>, !cir.ptr<!ty_22struct2EStruk22>
// CHECK-NEXT: cir.call @_ZN5StrukC2Ev(%1) : (!cir.ptr<!ty_22struct2EStruk22>) -> ()
// CHECK-NEXT: cir.return

// CHECK: cir.func @_Z3bazv()
// CHECK-NEXT: %0 = cir.alloca !22struct2EStruk22, cir.ptr <!22struct2EStruk22>, ["s"] {alignment = 4 : i64}
// CHECK-NEXT: cir.call @_ZN5StrukC1Ev(%0) : (!cir.ptr<!22struct2EStruk22>) -> ()
// CHECK-NEXT: %0 = cir.alloca !ty_22struct2EStruk22, cir.ptr <!ty_22struct2EStruk22>, ["s"] {alignment = 4 : i64}
// CHECK-NEXT: cir.call @_ZN5StrukC1Ev(%0) : (!cir.ptr<!ty_22struct2EStruk22>) -> ()
// CHECK-NEXT: cir.return
4 changes: 2 additions & 2 deletions clang/test/CIR/CodeGen/lambda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ void fn() {
auto a = [](){};
}

// CHECK: !22class2Eanon22 = !cir.struct<"class.anon", i8>
// CHECK: !ty_22class2Eanon22 = !cir.struct<"class.anon", i8>
// CHECK-NEXT: module
// CHECK-NEXT: cir.func @_Z2fnv()
// CHECK-NEXT: %0 = cir.alloca !22class2Eanon22, cir.ptr <!22class2Eanon22>, ["a"]
// CHECK-NEXT: %0 = cir.alloca !ty_22class2Eanon22, cir.ptr <!ty_22class2Eanon22>, ["a"]
Loading