From 0f65dfd92b0a2b07a87812f9bb01e4d43adcfdb0 Mon Sep 17 00:00:00 2001
From: Frederic Riss <friss@apple.com>
Date: Fri, 10 Oct 2014 15:51:10 +0000
Subject: [PATCH] [dwarfdump] Prettyprint DW_AT_APPLE_property_attribute
 bitfield values.

This change depends on the ApplePropertyString helper that I sent spearately.
Not sure how you want this tested: as a tool test by adding a binary to dump, or as an llvm test starting from an IR file?

Reviewers: dblaikie, samsonov

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D5689

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219507 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/DebugInfo/DWARFDebugInfoEntry.cpp         |  19 +++++++++
 test/DebugInfo/Inputs/dwarfdump-objc.m        |  16 +++++++
 test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o | Bin 0 -> 11512 bytes
 test/DebugInfo/dwarfdump-objc.test            |  40 ++++++++++++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 test/DebugInfo/Inputs/dwarfdump-objc.m
 create mode 100644 test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o
 create mode 100644 test/DebugInfo/dwarfdump-objc.test

diff --git a/lib/DebugInfo/DWARFDebugInfoEntry.cpp b/lib/DebugInfo/DWARFDebugInfoEntry.cpp
index 559667299ca..15c04cb949b 100644
--- a/lib/DebugInfo/DWARFDebugInfoEntry.cpp
+++ b/lib/DebugInfo/DWARFDebugInfoEntry.cpp
@@ -12,6 +12,7 @@
 #include "DWARFContext.h"
 #include "DWARFDebugAbbrev.h"
 #include "llvm/DebugInfo/DWARFFormValue.h"
+#include "llvm/Support/DataTypes.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Support/Format.h"
@@ -72,6 +73,21 @@ void DWARFDebugInfoEntryMinimal::dump(raw_ostream &OS, DWARFUnit *u,
   }
 }
 
+static void dumpApplePropertyAttribute(raw_ostream &OS, uint64_t Val) {
+  OS << " (";
+  do {
+    uint64_t Bit = 1ULL << countTrailingZeros(Val);
+    if (const char *PropName = ApplePropertyString(Bit))
+      OS << PropName;
+    else
+      OS << format("DW_APPLE_PROPERTY_0x%" PRIx64, Bit);
+    if (!(Val ^= Bit))
+      break;
+    OS << ", ";
+  } while (true);
+  OS << ")";
+}
+
 void DWARFDebugInfoEntryMinimal::dumpAttribute(raw_ostream &OS,
                                                DWARFUnit *u,
                                                uint32_t *offset_ptr,
@@ -130,6 +146,9 @@ void DWARFDebugInfoEntryMinimal::dumpAttribute(raw_ostream &OS,
     if (const DWARFUnit *RefU = findUnitAndExtractFast(DIE, u, &Ref))
       if (const char *Ref = DIE.getName(RefU, DINameKind::LinkageName))
         OS << " \"" << Ref << '\"';
+  } else if (attr == DW_AT_APPLE_property_attribute) {
+    if (Optional<uint64_t> OptVal = formValue.getAsUnsignedConstant())
+      dumpApplePropertyAttribute(OS, *OptVal);
   }
 
   OS << ")\n";
diff --git a/test/DebugInfo/Inputs/dwarfdump-objc.m b/test/DebugInfo/Inputs/dwarfdump-objc.m
new file mode 100644
index 00000000000..54fbee2ac39
--- /dev/null
+++ b/test/DebugInfo/Inputs/dwarfdump-objc.m
@@ -0,0 +1,16 @@
+// Compile with clang -g dwarfdump-objc.m -c -Wno-objc-root-class
+
+@interface NSObject {} @end
+
+
+@interface TestInterface
+@property (readonly) int ReadOnly;
+@property (assign) int Assign;
+@property (readwrite) int ReadWrite;
+@property (retain) NSObject *Retain;
+@property (copy) NSObject *Copy;
+@property (nonatomic) int NonAtomic;
+@end
+
+@implementation TestInterface
+@end
diff --git a/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o b/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o
new file mode 100644
index 0000000000000000000000000000000000000000..6b55d38ce91db67d1f11e3a5c78c5ebc82f3ee98
GIT binary patch
literal 11512
zcmeHNdvH|M9X^}A37gj?5Q>rK3PD2+F$Bbjs0kr9(Eu@70#2njAz8?3vPqNW<$$ae
z9S~)pQfnQmX^U+-!*pnMELPiLd@xL<HXU)wjE=KYwG&#jbVeO~RQmny{mxCYj|6S)
zUp<qv-~E2S^ZV}aJnp%7@8*x6y!ZJyr957R4^#uS4+iB&MY$BUNO+1eILUDwV;jwd
zN}bF&%ZdcIL`VRZ6{ubl7~=Zq1xW%$^dy)5X-bV3gQ21Vx>#0QaNWiYRw%r_OKg_4
zY;|SBP1>!r&WF-5l<#CZ=%21sfpeJVfb*&KTGp-W32sW%`*ph0?hg#woI5<)K2ECF
z5ef&z8=v3K3@84e18SM+9K?_xhajn5Z=}a=7_aB&_|IijjCzz8NUGP-)tXeVmgA-4
zGbiXH7nADsw1hVVdlUQn#r3+@-O*}=Hnq6@tqfGU=T`O1uau@d<j1KVYBcP~vTVJ!
zmPm_j#rTcTi&C$iF%{Gs#C&jQhp9>bY`xZwmfqfQOJ^{CJr7V%Ps6^r@f$ICP}X`~
z;a>YHiO(-ay#WUHF+cwdrIwAz%puh43`W`|J?M|T-j3ur?S91AZeGV)Dn)*x7unjK
zsCO%`hlLcF@HMUEV4_|tmU1Y(fz9IcyN`O0(O*5L-q3t>gnA?K<LBo@_^20yo~)M&
zzk9vq(Pab2FVxwxAt-xHyk1e9-e6pQ5Q)=k>F(|bS~3~9JQDVUQtI8#fjURM8oyG-
zc1H2nucIfu7B})6vHv~Dv$r|1s*amp|7Gq*Fk(t9Ygm5WEv@l-=crdmy(82k6-cTl
zizQiqC-HhXM1fP(JBs``M{#<sU7g4)Vr>j>4u#t+t8T=yKT5r3k0ZDRH!hjq^U%w7
zOmTX_c58i)TpD(XUw;Mpj(vc7r>BhEU!d9Uv~WIUT<jsr%CZe|GU-zNEUYoX%W*Hm
zo-eu7qe_u$MXL07395nmMa!z1-S5`y-hRGj_r`NIdp4f0*>k-}>@jXw`{MYS73z!l
zcdt4-Ok(#WNbLLX#v{)?_QHNvhIQ>3Np-!HlJPTl3UTti_pIOT)9zJ+ND6&hg;;x2
zsM)i95bjvb?mxpC8<en`dtdTPhvWMDzdqmS<B##(lQ_ix#4>f3rq5n$c}j03STaKw
zm42W}^IQqD-;<H&y%q-_pnAr6yf^7%UygUVKF-YXuEz1F(k83GD|@YdoL%JY&~0++
z3_R{oCvCQ}RgI`N`NUKWX6(|YOflUmriZmDM@$>V^f*48^NDG#n0~5F*<uQTsr04t
zVPwdo&bV)h#pBJB%fK#p<g<&XsTlslI7Sccj%KFq-;#^LdIMwT0qLFy5)-0)ekaJj
zlH}0SbO)l3%aL!)=&T9}L9rY_^dUsQ1%_xjRf_Xwr|s|1W3PP8jNay|ybqOhR8QvE
zIYb%tgd1Ii?)jbQF>=szu6%ure!*4gfy#1G$@17!le#x5Yk*O?XfMUnbQsY=CwlZ8
z+VxsfzC1>kxhfw)<v~%&9y^B$Ms0VaOEJYicB03~L9cP;i!%D4t8y1qUKW*{vFD<X
zQTnp;G(C;zm=isE4jua1QW;la1ar<H@Dg-C<9!_DPQ{T&c_w(~nEB~mGcRMR`R<PF
z37(0NPRsY4-I3!pv$GdxUzh#Y9k^L|qdPrnaEDo&FQ&hX$;ee+^75>*?DuxyR+U}|
z+YQ;-aA%BHwXlrKhh><MuLS3u=&8tR%lDe1bwy5X{=yukGSgLBmIw;TN^B+OY~2Rk
znGAU^o>p?@1WVvlkD{ijD`d5JJ~eak>5<Wsu~KcDTYA>FZS3rxCr>IRov@>1Vi25C
zkUk~rH|ffEeR_e7OMvfy=ci94pGrPMcv|7a^ch*cB{(Y1PoJhu(_GWAsI+`!f(P{Q
z2LGmDPj9Fz>|ao_sHD`NnABB~&TbV5_C{*MkzmjIme!zZ2)4AX40mi*p>RZ1_V$K0
zgl*gEo=`-*k(N+ct!P}i?v7w<L{)WlZ&fS0!j+M(&QPne+-QrTw#A9HMzphaEIWSQ
zH%Fx4*CK0GyvGquwD$%hj%)E+HFTU1F2Z&$NflhLBQivj=t%Y{M8u^P?Bj%R>2%Uy
zaX6v&Q9__QfJviWuOl%;F(e)9mDSqWrW&j3l>LPPCd^-#^CeR+N}zrg(>EnP{_1xJ
zO4j{XQAVr)oB&&fDq{Ul&L_{J*c|>}I0AlP#wep98<buH$(nuDewlZ@_L7}n`(<5@
z){kVdU&f|4Z2y-D9u}kbG`*z`+ojx%Mz$`OEY^FiZFDvgd$$C4b_e$YmpGR!{*s$;
zX#S##(#7R!Q(37XsH$*H3&jMgLaJhx-u!1FL*6R_q2h+(rlH-Rn?KA=`bOY(Oxe~U
z%3Dfcm~ipswwQF<xx<WbR>5hHgxhD4TmkElVc5t!hc%6rHF9&7y+Gd0>V3?)VLK~H
zjxV6doC`{kYeCkdyrz(^+G6{>K3aHkY3Fy_m(KaYvkhGbezJdWcw+sO?XT5Z&-~^4
zwO60`_<>g+SP=VJUg14I|7hGpmu<VJ$xu(<yX~gv{_(Yu%unC`VaB(Q`)+&P{MF7U
zJ9o`JpkCZow6p2eTR($-4w9ILD&GK>pw^+@j@p5`4fR3PgQ$m5pGQ53`X=gG)Xz|J
zko+{%V$>z5b*T0;Ftk_VSc*I|qp5mDK2ZEXIn+-lhjDCk`t4^&*jCHMhjL?F`wQgX
zqu+k+M?0-A&&MLA&oAE_gnvUmP(DGG!~4jkk8=1L^R=IV!6#5(o^^-&WgLWSe~et`
zBi|RrpD7<G_O~0LKHoiT{}9jD0iQJ0{XI^u^9{ze*K12+q$XQi&n)SmTnyipsImqn
z7txa(WSnH|Wqc$D>9_Pn&aeA0{2T~RIESoD-A2}|)Jf71MTX6T-O{VlVR!C^IHhfu
zxYFpZ?77o-Wnce9pjh%;1K*vfccbn{U5YC0<*R5RDvCVUizx<e{?s8~XT>BRe2FBT
z6_b1&pb1BI;dfm-K-&cUB&qxr^v`rKA-<XZRPj;zQ^ohuKg+=cef>Sre%r(jGsFh{
z4KP)F1r<}pN9j+Me;@s+^!1#3?rKn;EqR{2oN>N=h>>{{%@b#3#xGo;zEYKD-u-D+
zx%yrz?Utb)yNGsjog8I5j%QN6188^TBJ`d|yZ(#Ndk5|M*pB0n^t?Ifx7Oo$CvCS7
z?R0-f)4Lt*^!SaYhi|Sbb`kwOjCQBT=!d*8yhf?%4-<QVH!3yH0xp8R1c+Sb%_jE(
zZvg)X#%MA8zXOW@De^~v*bk@o5}SZmgD)V;Wm*pYI4*2RWjsP`Caxh)Ax<Q|ndY=V
zMSO&~m$-&lPm~u}qMt=P1tR<;aWC<HVm(oA;`qyu*9L-FMEhGfxU565FC^9gu^*f0
zle{4_OM&p2^4;P(pdW}G(Uj*&@dIr83FL(_F^>W-2lfM}1N(rvz$mZ`xCJ;L*bRiX
z*$%{ZXEp;%fYR@IK<PL3f3pUNZPBa%ejQj2oC_=kA}6y5h`yM4KwOKa4>$*?fS7Od
z96BfVLEvm)42XF)2Y~3ic>*{KcnpYjV;-TsA9xvf9}x3z?xTGd&<`F3VjY;>w6_Ci
zfHwm%c4j>gZ}`m`;6z{r5POJO4$K6W0>=Z3fK!2fAfB7d0$>3!4~U-<OdoI@Pyr_c
z&ttqV1)c+94>AXV(mn>f1b7;l4jceV`x8LCCpM1(4d79r<Z}dwz0d3iVo92PK*{G(
zAl9_G4~QW&cLAk+6o}_Ja|;lunB72W-ww<JHUm-2HTV#Fy%78r0A>CG_BuKbgie5H
zd_Yb#&XE(1v*bi$keq19-X?lPBSua%-Xtd)r^$)NDRQDQKu$DHk`s*+<V52oa-wmJ
zoM=2xPBe~^6OE_IiN+CfqH&m<X!Mg4jYH%_qX-=H6(AY`@JZlAqn?~-)R7a78gil`
z>lS|*exeZJF|-prM(iU-iOs|cqMrz`;||E;f`Bf^$^A6kEQ=EU3i7w;Zzf+)f0X<e
z^!JgM&_6(aH~n&5NtvYe$v>t)N`4>xedJF9O>BJaIZph`<S|^#QdUVkE_nTWzU*rz
z+UnoWZxoITLI3{!FS$tJf0lX&$&Zl-grog!s8Vw1e}(>+3@83|@@?dAlP?sG*fz$W
zmHxo@H~J3=hp&VFy|S6W_aXh&<e!kg%kz8LekXY@c_qiA2xA}xZ(eP^sq}xqeDwdr
z9A>_A=x-yRM?Q_boct8?uOi<h`Qdmg`8?)(3;89?ryO%8MeY+Ob|L-$0w*Ou@V#t*
zC;8*#v&o+%e?#&?`(KhjO#U4CE#$u^_mcmK{5i=V@n^`_O1|LllTRWyV3YC`&o6DH
ze1t0NPj1dqLg?Rkti34L-(#@N^eMH59QRn8cax`~|Ki_5-ax<p|CryBH`BkFyq#RW
zcggws$=`+_Cb!7(aDE14IG5+7;aoZY7qcN4sqg9P4)#R0(t>w0+G4fXZ^^Azd1-E~
zTzYerRohhAU=>;;-hP%iZ#PD3;J$bny^;L_Wwa*xCH*M5485q~zlH=myCYkz)|S@x
zpz3hM3$6NwmGxF#ZDU|$SB4tYu4oKYuBfWE(Baz3rFGSfW42sg9jIBkEWVv{#;Ur?
z#>V)8<Cr3@GP$4WI?jfb3Gws~2_$Lb%yZ(bjyj=3FQ)38{O$2tQMtU@stg1gEJd?)
zSw_eT+*V)hTAh6D)(H(AYy9sdRY`wg(5oi#*8}GrT%tYI?=9}4NDOhin&{GRE|Yqk
z6!6nUd|wdd{<f3E=cbZ8)J+HOq=S5|Hpfj#nd@*T#UAVVDeUE`bX-TAPNLnO^lMV-
zxQ;lT6!t}_bX-TAP73?gsdQY2t7GRsKhbWF+rm^juEW)F#yQb$>n}*9<2vGWQrOE<
v=qyO(D03ZgCrD*ab%OcYF;b^2g?+wjk6WP&N)v?a5h_cxJ0n_(d)B`Jq@pY_

literal 0
HcmV?d00001

diff --git a/test/DebugInfo/dwarfdump-objc.test b/test/DebugInfo/dwarfdump-objc.test
new file mode 100644
index 00000000000..6890c3a0471
--- /dev/null
+++ b/test/DebugInfo/dwarfdump-objc.test
@@ -0,0 +1,40 @@
+RUN: llvm-dwarfdump %p/Inputs/dwarfdump-objc.x86_64.o | FileCheck %s
+
+CHECK:      .debug_info contents:
+
+CHECK: DW_TAG_APPLE_property
+CHECK-NOT: TAG
+CHECK:    DW_AT_APPLE_property_name {{.*}} "ReadOnly"
+CHECK-NOT: TAG
+CHECK:    DW_AT_APPLE_property_attribute {{.*}} (0x01 (DW_APPLE_PROPERTY_readonly))
+
+CHECK: DW_TAG_APPLE_property
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_name {{.*}} "Assign"
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_attribute {{.*}} (0x0c (DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite))
+
+CHECK: DW_TAG_APPLE_property
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_name {{.*}} "ReadWrite"
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_attribute {{.*}} (0x0c (DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite))
+
+CHECK: DW_TAG_APPLE_property
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_name {{.*}} "Retain"
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_attribute {{.*}} (0x18 (DW_APPLE_PROPERTY_readwrite, DW_APPLE_PROPERTY_retain))
+
+CHECK: DW_TAG_APPLE_property
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_name {{.*}} "Copy"
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_attribute {{.*}} (0x28 (DW_APPLE_PROPERTY_readwrite, DW_APPLE_PROPERTY_copy))
+
+CHECK: DW_TAG_APPLE_property
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_name {{.*}} "NonAtomic"
+CHECK-NOT: TAG
+CHECK:   DW_AT_APPLE_property_attribute {{.*}} (0x4c (DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite, DW_APPLE_PROPERTY_nonatomic))
+
-- 
2.34.1