Update LLDB snapshot to upstream r225923 (git 2b588ecd)

Sponsored by:	DARPA, AFRL

1 files changed, 15 insertions, 2 deletions

diff --git a/contrib/llvm/tools/lldb/source/API/SBInstruction.cpp b/contrib/llvm/tools/lldb/source/API/SBInstruction.cpp
index 2334cc0..eccc4e2 100644
--- a/contrib/llvm/tools/lldb/source/API/SBInstruction.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBInstruction.cpp
@@ -20,6 +20,7 @@
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/Disassembler.h"
 #include "lldb/Core/EmulateInstruction.h"
+#include "lldb/Core/Module.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/StackFrame.h"
@@ -170,9 +171,15 @@ SBInstruction::GetDescription (lldb::SBStream &s)
 {
     if (m_opaque_sp)
     {
+        SymbolContext sc;
+        const Address &addr = m_opaque_sp->GetAddress();
+        ModuleSP module_sp (addr.GetModule());
+        if (module_sp)
+            module_sp->ResolveSymbolContextForAddress(addr, eSymbolContextEverything, sc);
         // Use the "ref()" instead of the "get()" accessor in case the SBStream 
         // didn't have a stream already created, one will get created...
-        m_opaque_sp->Dump (&s.ref(), 0, true, false, NULL);
+        const char *disassemble_format = "${addr-file-or-load}: ";
+        m_opaque_sp->Dump (&s.ref(), 0, true, false, NULL, &sc, NULL, disassemble_format);
         return true;
     }
     return false;
@@ -186,8 +193,14 @@ SBInstruction::Print (FILE *out)
 
     if (m_opaque_sp)
     {
+        SymbolContext sc;
+        const Address &addr = m_opaque_sp->GetAddress();
+        ModuleSP module_sp (addr.GetModule());
+        if (module_sp)
+            module_sp->ResolveSymbolContextForAddress(addr, eSymbolContextEverything, sc);
         StreamFile out_stream (out, false);
-        m_opaque_sp->Dump (&out_stream, 0, true, false, NULL);
+        const char *disassemble_format = "${addr-file-or-load}: ";
+        m_opaque_sp->Dump (&out_stream, 0, true, false, NULL, &sc, NULL, disassemble_format);
     }
 }