[Lldb-commits] [lldb] r270621 - Fix an issue where the NSDate data formatter was not using the proper alignment on watchOS targets
Enrico Granata via lldb-commits
lldb-commits at lists.llvm.org
Tue May 24 15:11:58 PDT 2016
Author: enrico
Date: Tue May 24 17:11:57 2016
New Revision: 270621
URL: http://llvm.org/viewvc/llvm-project?rev=270621&view=rev
Log:
Fix an issue where the NSDate data formatter was not using the proper alignment on watchOS targets
Fixes rdar://problem/23298264
Modified:
lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp
Modified: lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp?rev=270621&r1=270620&r2=270621&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp (original)
+++ lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp Tue May 24 17:11:57 2016
@@ -670,8 +670,10 @@ lldb_private::formatters::NSDateSummaryP
}
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;
More information about the lldb-commits
mailing list