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

5 files changed, 9 insertions, 9 deletions

diff --git a/lldb/source/API/SBBlock.cpp b/lldb/source/API/SBBlock.cpp
index 5374a7f86ba..580d2b5a213 100644
--- a/lldb/source/API/SBBlock.cpp
+++ b/lldb/source/API/SBBlock.cpp
@@ -174,7 +174,7 @@ SBBlock::GetDescription (SBStream &description)
     if (m_opaque_ptr)
     {
         lldb::user_id_t id = m_opaque_ptr->GetID();
-        description.Printf ("Block: {id: %d} ", id);
+        description.Printf ("Block: {id: %llu} ", id);
         if (IsInlined())
         {
             description.Printf (" (inlined, '%s') ", GetInlinedName());
diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp
index f71b8604bc9..dfef7eb3178 100644
--- a/lldb/source/API/SBDebugger.cpp
+++ b/lldb/source/API/SBDebugger.cpp
@@ -969,7 +969,7 @@ SBDebugger::GetDescription (SBStream &description)
     {
         const char *name = m_opaque_sp->GetInstanceName().AsCString();
         user_id_t id = m_opaque_sp->GetID();
-        description.Printf ("Debugger (instance: \"%s\", id: %d)", name, id);
+        description.Printf ("Debugger (instance: \"%s\", id: %llu)", name, id);
     }
     else
         description.Printf ("No value");
diff --git a/lldb/source/API/SBFunction.cpp b/lldb/source/API/SBFunction.cpp
index e037f83e8da..4e23b9dfb49 100644
--- a/lldb/source/API/SBFunction.cpp
+++ b/lldb/source/API/SBFunction.cpp
@@ -107,9 +107,9 @@ SBFunction::GetDescription (SBStream &s)
 {
     if (m_opaque_ptr)
     {
-        s.Printf ("SBFunction: id = 0x%8.8x, name = %s", 
-                            m_opaque_ptr->GetID(),
-                            m_opaque_ptr->GetName().AsCString());
+        s.Printf ("SBFunction: id = 0x%8.8llx, name = %s", 
+                  m_opaque_ptr->GetID(),
+                  m_opaque_ptr->GetName().AsCString());
         Type *func_type = m_opaque_ptr->GetType();
         if (func_type)
             s.Printf(", type = %s", func_type->GetName().AsCString());
diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp
index c9062bd0a21..7e04d5af159 100644
--- a/lldb/source/API/SBProcess.cpp
+++ b/lldb/source/API/SBProcess.cpp
@@ -303,7 +303,7 @@ SBProcess::ReportEventState (const SBEvent &event, FILE *out) const
         char message[1024];
         int message_len = ::snprintf (message,
                                       sizeof (message),
-                                      "Process %d %s\n",
+                                      "Process %llu %s\n",
                                       m_opaque_sp->GetID(),
                                       SBDebugger::StateAsCString (event_state));
 
@@ -321,7 +321,7 @@ SBProcess::AppendEventStateReport (const SBEvent &event, SBCommandReturnObject &
         char message[1024];
         ::snprintf (message,
                     sizeof (message),
-                    "Process %d %s\n",
+                    "Process %llu %s\n",
                     m_opaque_sp->GetID(),
                     SBDebugger::StateAsCString (event_state));
 
@@ -809,7 +809,7 @@ SBProcess::GetDescription (SBStream &description)
         if (exe_module)
             exe_name = exe_module->GetFileSpec().GetFilename().AsCString();
 
-        description.Printf ("SBProcess: pid = %d, state = %s, threads = %d%s%s", 
+        description.Printf ("SBProcess: pid = %llu, state = %s, threads = %d%s%s", 
                             m_opaque_sp->GetID(),
                             lldb_private::StateAsCString (GetState()), 
                             GetNumThreads(),
diff --git a/lldb/source/API/SBThread.cpp b/lldb/source/API/SBThread.cpp
index 6b498c12a92..6c24e980982 100644
--- a/lldb/source/API/SBThread.cpp
+++ b/lldb/source/API/SBThread.cpp
@@ -954,7 +954,7 @@ SBThread::GetDescription (SBStream &description) const
     if (m_opaque_sp)
     {
         StreamString strm;
-        description.Printf("SBThread: tid = 0x%4.4x", m_opaque_sp->GetID());
+        description.Printf("SBThread: tid = 0x%4.4llx", m_opaque_sp->GetID());
     }
     else
         description.Printf ("No value");