From 769b366b83dcc12bfe06935f816023cdcfbdf578 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 23 Mar 2015 14:37:24 +0000 Subject: [PATCH] gallivm: Use MCInstrInfo in the disassembler for querying instruction info This fixes the build since llvm r232885 and also simplifies the code. --- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index 2c4ed21edd4..bf6268b3360 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -276,12 +276,6 @@ disassemble(const void* func, llvm::raw_ostream & Out) #endif OwningPtr TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options)); -#if HAVE_LLVM >= 0x0306 - const TargetInstrInfo *TII = TM->getSubtargetImpl()->getInstrInfo(); -#else - const TargetInstrInfo *TII = TM->getInstrInfo(); -#endif - /* * Wrap the data in a MemoryObject */ @@ -336,7 +330,7 @@ disassemble(const void* func, llvm::raw_ostream & Out) pc += Size; - const MCInstrDesc &TID = TII->get(Inst.getOpcode()); + const MCInstrDesc &TID = MII->get(Inst.getOpcode()); /* * Keep track of forward jumps to a nearby address. -- 2.30.2