diff options
| author | Enrico Granata <egranata@apple.com> | 2016-05-24 22:11:57 +0000 |
|---|---|---|
| committer | Enrico Granata <egranata@apple.com> | 2016-05-24 22:11:57 +0000 |
| commit | 34c77c3c93d6a08cad92a026458ee06200220cf3 (patch) | |
| tree | 670389db449aa7250e1790d508f57a8e3f672724 | |
| parent | 63294b730d1ebd2a4f606222e6e8a2d556b40ae7 (diff) | |
| download | bcm5719-llvm-34c77c3c93d6a08cad92a026458ee06200220cf3.tar.gz bcm5719-llvm-34c77c3c93d6a08cad92a026458ee06200220cf3.zip | |
Fix an issue where the NSDate data formatter was not using the proper alignment on watchOS targets
Fixes rdar://problem/23298264
llvm-svn: 270621
| -rw-r--r-- | lldb/source/Plugins/Language/ObjC/Cocoa.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp index b4a16337dc1..10ac4c6ce52 100644 --- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp +++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp @@ -670,8 +670,10 @@ lldb_private::formatters::NSDateSummaryProvider (ValueObject& valobj, Stream& st } else { + llvm::Triple triple(process_sp->GetTarget().GetArchitecture().GetTriple()); + uint32_t delta = (triple.isWatchOS() && triple.isWatchABI()) ? 8 : ptr_size; Error error; - date_value_bits = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr+ptr_size, 8, 0, error); + date_value_bits = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr+delta, 8, 0, error); date_value = *((double*)&date_value_bits); if (error.Fail()) return false; |
