[Lldb-commits] [lldb] r206213 - Fix LLDB to build with top of tree LLVM/Clang.

[Greg Clayton]

Author: gclayton
Date: Mon Apr 14 16:33:38 2014
New Revision: 206213

URL: http://llvm.org/viewvc/llvm-project?rev=206213&view=rev
Log:
Fix LLDB to build with top of tree LLVM/Clang.

Patch from Michael Tao.


Modified:
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp

Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp?rev=206213&r1=206212&r2=206213&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp (original)
+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp Mon Apr 14 16:33:38 2014
@@ -13,6 +13,7 @@
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCExternalSymbolizer.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrInfo.h"
@@ -454,11 +455,8 @@ DisassemblerLLVMC::LLVMCDisassembler::LL
             m_is_valid = false;
             return;
         }
-        m_disasm_ap->setupForSymbolicDisassembly(NULL,
-                                                 DisassemblerLLVMC::SymbolLookupCallback,
-                                                 (void *) &owner,
-                                                 m_context_ap.get(),
-                                                 RelInfo);
+        m_disasm_ap->setSymbolizer(std::unique_ptr<llvm::MCSymbolizer>(new llvm::MCExternalSymbolizer(*m_context_ap.get(),std::move(RelInfo),NULL,DisassemblerLLVMC::SymbolLookupCallback,(void *) &owner)));
+
         
         unsigned asm_printer_variant;
         if (flavor == ~0U)