Skip to content

Commit cad9965

Browse files
committed
[llvm][DebugInfo][ObjC] Fix argument oreder of setter/getter to DIObjDIObjCProperty constructor
Depends on #165373 This caused the `DW_AT_APPLE_property_(setter|getter)` to be inverted when compiling from LLVM IR. (cherry picked from commit 62797e1)
1 parent 692e387 commit cad9965

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

llvm/lib/AsmParser/LLParser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6341,8 +6341,8 @@ bool LLParser::parseDIObjCProperty(MDNode *&Result, bool IsDistinct) {
63416341
#undef VISIT_MD_FIELDS
63426342

63436343
Result = GET_OR_DISTINCT(DIObjCProperty,
6344-
(Context, name.Val, file.Val, line.Val, setter.Val,
6345-
getter.Val, attributes.Val, type.Val));
6344+
(Context, name.Val, file.Val, line.Val, getter.Val,
6345+
setter.Val, attributes.Val, type.Val));
63466346
return false;
63476347
}
63486348

llvm/test/DebugInfo/Generic/objc-property.ll

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,24 @@
1515
; CHECK-SAME: DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite,
1616
; CHECK-SAME: DW_APPLE_PROPERTY_atomic, DW_APPLE_PROPERTY_unsafe_unretained
1717
;
18-
; FIXME: this should have a DW_AT_APPLE_property_getter tag
1918
; CHECK: DW_TAG_APPLE_property
2019
; CHECK: DW_AT_APPLE_property_name ("customGetterProp")
21-
; CHECK: DW_AT_APPLE_property_setter ("customGetter")
20+
; CHECK: DW_AT_APPLE_property_getter ("customGetter")
2221
; CHECK: DW_AT_APPLE_property_attribute
2322
; CHECK-SAME: DW_APPLE_PROPERTY_getter, DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite,
2423
; CHECK-SAME: DW_APPLE_PROPERTY_atomic, DW_APPLE_PROPERTY_unsafe_unretained
2524
;
26-
; FIXME: this should have a DW_AT_APPLE_property_setter tag
2725
; CHECK: DW_TAG_APPLE_property
2826
; CHECK: DW_AT_APPLE_property_name ("customSetterProp")
29-
; CHECK: DW_AT_APPLE_property_getter ("customSetter:")
27+
; CHECK: DW_AT_APPLE_property_setter ("customSetter:")
3028
; CHECK: DW_AT_APPLE_property_attribute
3129
; CHECK-SAME: DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite,
3230
; CHECK-SAME: DW_APPLE_PROPERTY_setter, DW_APPLE_PROPERTY_atomic, DW_APPLE_PROPERTY_unsafe_unretained
3331
;
34-
; FIXME: the DW_AT_APPLE_property_(getter|setter) values are inverted
3532
; CHECK: DW_TAG_APPLE_property
3633
; CHECK: DW_AT_APPLE_property_name ("customAccessorsProp")
37-
; CHECK: DW_AT_APPLE_property_getter ("customSetter:")
38-
; CHECK: DW_AT_APPLE_property_setter ("customGetter")
34+
; CHECK: DW_AT_APPLE_property_getter ("customGetter")
35+
; CHECK: DW_AT_APPLE_property_setter ("customSetter:")
3936
; CHECK: DW_AT_APPLE_property_attribute
4037
; CHECK-SAME: DW_APPLE_PROPERTY_getter, DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite,
4138
; CHECK-SAME: DW_APPLE_PROPERTY_setter, DW_APPLE_PROPERTY_atomic, DW_APPLE_PROPERTY_unsafe_unretained

0 commit comments

Comments
 (0)