diff options
| -rw-r--r-- | llvm/tools/edis/EDDisassembler.cpp | 9 | ||||
| -rw-r--r-- | llvm/tools/edis/EDDisassembler.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/llvm/tools/edis/EDDisassembler.cpp b/llvm/tools/edis/EDDisassembler.cpp index 5a59e34f576..83505c3b9f5 100644 --- a/llvm/tools/edis/EDDisassembler.cpp +++ b/llvm/tools/edis/EDDisassembler.cpp @@ -175,11 +175,10 @@ EDDisassembler::EDDisassembler(CPUKey &key) : 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 @@ EDDisassembler::EDDisassembler(CPUKey &key) : SpecificAsmLexer.reset(Tgt->createAsmLexer(*AsmInfo)); SpecificAsmLexer->InstallLexer(*GenericAsmLexer); - initMaps(*targetMachine->getRegisterInfo()); + initMaps(*TargetMachine->getRegisterInfo()); Valid = true; } diff --git a/llvm/tools/edis/EDDisassembler.h b/llvm/tools/edis/EDDisassembler.h index 74a260e8253..913ae842bf9 100644 --- a/llvm/tools/edis/EDDisassembler.h +++ b/llvm/tools/edis/EDDisassembler.h @@ -47,6 +47,7 @@ class MCStreamer; template <typename T> class SmallVectorImpl; class SourceMgr; class Target; +class TargetMachine; class TargetRegisterInfo; struct EDInstInfo; @@ -127,6 +128,8 @@ struct EDDisassembler { 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 |
