edis: Save the TargetMachine in the EDDisassembler object.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108663 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/edis/EDDisassembler.cpp b/tools/edis/EDDisassembler.cpp
index 5a59e34..83505c3 100644
--- a/tools/edis/EDDisassembler.cpp
+++ b/tools/edis/EDDisassembler.cpp
@@ -175,11 +175,10 @@
std::string featureString;
- OwningPtr<const TargetMachine>
- targetMachine(Tgt->createTargetMachine(tripleString,
- featureString));
+ TargetMachine.reset(Tgt->createTargetMachine(tripleString,
+ featureString));
- const TargetRegisterInfo *registerInfo = targetMachine->getRegisterInfo();
+ const TargetRegisterInfo *registerInfo = TargetMachine->getRegisterInfo();
if (!registerInfo)
return;
@@ -209,7 +208,7 @@
SpecificAsmLexer.reset(Tgt->createAsmLexer(*AsmInfo));
SpecificAsmLexer->InstallLexer(*GenericAsmLexer);
- initMaps(*targetMachine->getRegisterInfo());
+ initMaps(*TargetMachine->getRegisterInfo());
Valid = true;
}
diff --git a/tools/edis/EDDisassembler.h b/tools/edis/EDDisassembler.h
index 74a260e..913ae84 100644
--- a/tools/edis/EDDisassembler.h
+++ b/tools/edis/EDDisassembler.h
@@ -47,6 +47,7 @@
template <typename T> class SmallVectorImpl;
class SourceMgr;
class Target;
+class TargetMachine;
class TargetRegisterInfo;
struct EDInstInfo;
@@ -127,6 +128,8 @@
CPUKey Key;
/// The LLVM target corresponding to the disassembler
const llvm::Target *Tgt;
+ /// The target machien instance.
+ llvm::OwningPtr<llvm::TargetMachine> TargetMachine;
/// The assembly information for the target architecture
llvm::OwningPtr<const llvm::MCAsmInfo> AsmInfo;
/// The disassembler for the target architecture