Moved lldb::user_id_t values to be 64 bit. This was going to be needed for

process IDs, and thread IDs, but was mainly needed for for the UserID's for
Types so that DWARF with debug map can work flawlessly. With DWARF in .o files
the type ID was the DIE offset in the DWARF for the .o file which is not
unique across all .o files, so now the SymbolFileDWARFDebugMap class will
make the .o file index part (the high 32 bits) of the unique type identifier
so it can uniquely identify the types.

llvm-svn: 142534

1 files changed, 3 insertions, 3 deletions

diff --git a/lldb/source/Target/ThreadPlanBase.cpp b/lldb/source/Target/ThreadPlanBase.cpp
index 5c2631ad172..ebaa4dcf86f 100644
--- a/lldb/source/Target/ThreadPlanBase.cpp
+++ b/lldb/source/Target/ThreadPlanBase.cpp
@@ -106,7 +106,7 @@ ThreadPlanBase::ShouldStop (Event *event_ptr)
                 // at this point.  Don't force the discard, however, so Master plans can stay
                 // in place if they want to.
                 if (log)
-                    log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4x (breakpoint hit.)", m_thread.GetID());
+                    log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4llx (breakpoint hit.)", m_thread.GetID());
                 m_thread.DiscardThreadPlans(false);
                 return true;
             }
@@ -134,7 +134,7 @@ ThreadPlanBase::ShouldStop (Event *event_ptr)
             // If we crashed, discard thread plans and stop.  Don't force the discard, however,
             // since on rerun the target may clean up this exception and continue normally from there.
                 if (log)
-                    log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4x (exception.)", m_thread.GetID());
+                    log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4llx (exception.)", m_thread.GetID());
             m_thread.DiscardThreadPlans(false);
             return true;
 
@@ -142,7 +142,7 @@ ThreadPlanBase::ShouldStop (Event *event_ptr)
             if (stop_info_sp->ShouldStop(event_ptr))
             {
                 if (log)
-                    log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4x (signal.)", m_thread.GetID());
+                    log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4llx (signal.)", m_thread.GetID());
                 m_thread.DiscardThreadPlans(false);
                 return true;
             }