vendor/lldb/lldb-r228549

1 files changed, 3 insertions, 2 deletions

diff --git a/source/API/SBInstructionList.cpp b/source/API/SBInstructionList.cpp
index 31585b3e6868..812824b4d2e5 100644
--- a/source/API/SBInstructionList.cpp
+++ b/source/API/SBInstructionList.cpp
@@ -102,7 +102,8 @@ SBInstructionList::GetDescription (lldb::SBStream &description)
             // exist already inside description...
             Stream &sref = description.ref();
             const uint32_t max_opcode_byte_size = m_opaque_sp->GetInstructionList().GetMaxOpcocdeByteSize();
-            const char *disassemble_format = "${addr-file-or-load}: ";
+            FormatEntity::Entry format;
+            FormatEntity::Parse("${addr}: ", format);
             SymbolContext sc;
             SymbolContext prev_sc;
             for (size_t i=0; i<num_instructions; ++i)
@@ -119,7 +120,7 @@ SBInstructionList::GetDescription (lldb::SBStream &description)
                     module_sp->ResolveSymbolContextForAddress(addr, eSymbolContextEverything, sc);
                 }
 
-                inst->Dump (&sref, max_opcode_byte_size, true, false, NULL, &sc, &prev_sc, disassemble_format);
+                inst->Dump (&sref, max_opcode_byte_size, true, false, NULL, &sc, &prev_sc, &format);
                 sref.EOL();
             }
             return true;