<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 10 Oct 2014, at 09:32, David Blaikie <<a href="mailto:dblaikie@gmail.com" class="">dblaikie@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class=""><br class=""><div class="gmail_extra"><br class=""><div class="gmail_quote">On Fri, Oct 10, 2014 at 8:51 AM, Frederic Riss <span dir="ltr" class=""><<a href="mailto:friss@apple.com" target="_blank" class="">friss@apple.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: friss<br class="">
Date: Fri Oct 10 10:51:10 2014<br class="">
New Revision: 219507<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=219507&view=rev" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=219507&view=rev</a><br class="">
Log:<br class="">
[dwarfdump] Prettyprint DW_AT_APPLE_property_attribute bitfield values.<br class="">
<br class="">
This change depends on the ApplePropertyString helper that I sent spearately.<br class="">
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?<br class=""></blockquote><div class=""><br class=""></div><div class="">^ probably worth updating the commit message before committing when it contains comments more intended for review rather than for the commit itself. (just for next time)</div></div></div></div></div></blockquote><div><br class=""></div><div>I’ve seen that just after having the ‘git svn dcommit’ finishing… I usually ‘git log HEAD…origin/master’ just before pushing to check that everything’s fine, don’t I didn’t this time. I’d really prefer that phab/arc had a way to differentiate the commit log from the review comments/questions (in the original submission), it would prevent this sort of errors.</div><div><br class=""></div><div>Fred</div><div><br class=""></div><blockquote type="cite" class=""><div class=""><div dir="ltr" class=""><div class="gmail_extra"><div class="gmail_quote"><div class=""> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br class="">
Reviewers: dblaikie, samsonov<br class="">
<br class="">
Subscribers: llvm-commits<br class=""></blockquote><div class=""><br class=""></div><div class="">I usually at least drop the "Subscribers" line from the commit message too. Sometimes even the Reviewers, since someone can consult the review thread for that context. (but sometimes it's nice/useful to note the reviewers)</div><div class=""> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br class="">
Differential Revision: <a href="http://reviews.llvm.org/D5689" target="_blank" class="">http://reviews.llvm.org/D5689</a><br class="">
<br class="">
Added:<br class="">
llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.m<br class="">
llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o<br class="">
llvm/trunk/test/DebugInfo/dwarfdump-objc.test<br class="">
Modified:<br class="">
llvm/trunk/lib/DebugInfo/DWARFDebugInfoEntry.cpp<br class="">
<br class="">
Modified: llvm/trunk/lib/DebugInfo/DWARFDebugInfoEntry.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARFDebugInfoEntry.cpp?rev=219507&r1=219506&r2=219507&view=diff" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARFDebugInfoEntry.cpp?rev=219507&r1=219506&r2=219507&view=diff</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/lib/DebugInfo/DWARFDebugInfoEntry.cpp (original)<br class="">
+++ llvm/trunk/lib/DebugInfo/DWARFDebugInfoEntry.cpp Fri Oct 10 10:51:10 2014<br class="">
@@ -12,6 +12,7 @@<br class="">
#include "DWARFContext.h"<br class="">
#include "DWARFDebugAbbrev.h"<br class="">
#include "llvm/DebugInfo/DWARFFormValue.h"<br class="">
+#include "llvm/Support/DataTypes.h"<br class="">
#include "llvm/Support/Debug.h"<br class="">
#include "llvm/Support/Dwarf.h"<br class="">
#include "llvm/Support/Format.h"<br class="">
@@ -72,6 +73,21 @@ void DWARFDebugInfoEntryMinimal::dump(ra<br class="">
}<br class="">
}<br class="">
<br class="">
+static void dumpApplePropertyAttribute(raw_ostream &OS, uint64_t Val) {<br class="">
+ OS << " (";<br class="">
+ do {<br class="">
+ uint64_t Bit = 1ULL << countTrailingZeros(Val);<br class="">
+ if (const char *PropName = ApplePropertyString(Bit))<br class="">
+ OS << PropName;<br class="">
+ else<br class="">
+ OS << format("DW_APPLE_PROPERTY_0x%" PRIx64, Bit);<br class="">
+ if (!(Val ^= Bit))<br class="">
+ break;<br class="">
+ OS << ", ";<br class="">
+ } while (true);<br class="">
+ OS << ")";<br class="">
+}<br class="">
+<br class="">
void DWARFDebugInfoEntryMinimal::dumpAttribute(raw_ostream &OS,<br class="">
DWARFUnit *u,<br class="">
uint32_t *offset_ptr,<br class="">
@@ -130,6 +146,9 @@ void DWARFDebugInfoEntryMinimal::dumpAtt<br class="">
if (const DWARFUnit *RefU = findUnitAndExtractFast(DIE, u, &Ref))<br class="">
if (const char *Ref = DIE.getName(RefU, DINameKind::LinkageName))<br class="">
OS << " \"" << Ref << '\"';<br class="">
+ } else if (attr == DW_AT_APPLE_property_attribute) {<br class="">
+ if (Optional<uint64_t> OptVal = formValue.getAsUnsignedConstant())<br class="">
+ dumpApplePropertyAttribute(OS, *OptVal);<br class="">
}<br class="">
<br class="">
OS << ")\n";<br class="">
<br class="">
Added: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.m<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.m?rev=219507&view=auto" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.m?rev=219507&view=auto</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.m (added)<br class="">
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.m Fri Oct 10 10:51:10 2014<br class="">
@@ -0,0 +1,16 @@<br class="">
+// Compile with clang -g dwarfdump-objc.m -c -Wno-objc-root-class<br class="">
+<br class="">
+@interface NSObject {} @end<br class="">
+<br class="">
+<br class="">
+@interface TestInterface<br class="">
+@property (readonly) int ReadOnly;<br class="">
+@property (assign) int Assign;<br class="">
+@property (readwrite) int ReadWrite;<br class="">
+@property (retain) NSObject *Retain;<br class="">
+@property (copy) NSObject *Copy;<br class="">
+@property (nonatomic) int NonAtomic;<br class="">
+@end<br class="">
+<br class="">
+@implementation TestInterface<br class="">
+@end<br class="">
<br class="">
Added: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o?rev=219507&view=auto" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o?rev=219507&view=auto</a><br class="">
==============================================================================<br class="">
Binary files llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o (added) and llvm/trunk/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o Fri Oct 10 10:51:10 2014 differ<br class="">
<br class="">
Added: llvm/trunk/test/DebugInfo/dwarfdump-objc.test<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarfdump-objc.test?rev=219507&view=auto" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarfdump-objc.test?rev=219507&view=auto</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/test/DebugInfo/dwarfdump-objc.test (added)<br class="">
+++ llvm/trunk/test/DebugInfo/dwarfdump-objc.test Fri Oct 10 10:51:10 2014<br class="">
@@ -0,0 +1,40 @@<br class="">
+RUN: llvm-dwarfdump %p/Inputs/dwarfdump-objc.x86_64.o | FileCheck %s<br class="">
+<br class="">
+CHECK: .debug_info contents:<br class="">
+<br class="">
+CHECK: DW_TAG_APPLE_property<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_name {{.*}} "ReadOnly"<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_attribute {{.*}} (0x01 (DW_APPLE_PROPERTY_readonly))<br class="">
+<br class="">
+CHECK: DW_TAG_APPLE_property<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_name {{.*}} "Assign"<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_attribute {{.*}} (0x0c (DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite))<br class="">
+<br class="">
+CHECK: DW_TAG_APPLE_property<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_name {{.*}} "ReadWrite"<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_attribute {{.*}} (0x0c (DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite))<br class="">
+<br class="">
+CHECK: DW_TAG_APPLE_property<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_name {{.*}} "Retain"<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_attribute {{.*}} (0x18 (DW_APPLE_PROPERTY_readwrite, DW_APPLE_PROPERTY_retain))<br class="">
+<br class="">
+CHECK: DW_TAG_APPLE_property<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_name {{.*}} "Copy"<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_attribute {{.*}} (0x28 (DW_APPLE_PROPERTY_readwrite, DW_APPLE_PROPERTY_copy))<br class="">
+<br class="">
+CHECK: DW_TAG_APPLE_property<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_name {{.*}} "NonAtomic"<br class="">
+CHECK-NOT: TAG<br class="">
+CHECK: DW_AT_APPLE_property_attribute {{.*}} (0x4c (DW_APPLE_PROPERTY_assign, DW_APPLE_PROPERTY_readwrite, DW_APPLE_PROPERTY_nonatomic))<br class="">
+<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@cs.uiuc.edu" class="">llvm-commits@cs.uiuc.edu</a><br class="">
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank" class="">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div><br class=""></div></div>
</div></blockquote></div><br class=""></body></html>