Mesa (master): gallivm: Use MCInstrInfo in the disassembler for querying instruction info

[Tom Stellard]

Module: Mesa
Branch: master
Commit: 769b366b83dcc12bfe06935f816023cdcfbdf578
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=769b366b83dcc12bfe06935f816023cdcfbdf578

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Mon Mar 23 14:37:24 2015 +0000

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 2c4ed21..bf6268b 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<TargetMachine> 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.