[llvm-commits] [llvm] r99101 - /llvm/trunk/tools/llvm-mc/Disassembler.cpp
Daniel Dunbar
daniel at zuster.org
Sat Mar 20 15:36:35 PDT 2010
Author: ddunbar
Date: Sat Mar 20 17:36:35 2010
New Revision: 99101
URL: http://llvm.org/viewvc/llvm-project?rev=99101&view=rev
Log:
llvm-mc: Fix MCInstPrinter memory leaks.
Modified:
llvm/trunk/tools/llvm-mc/Disassembler.cpp
Modified: llvm/trunk/tools/llvm-mc/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.cpp?rev=99101&r1=99100&r2=99101&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Disassembler.cpp (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.cpp Sat Mar 20 17:36:35 2010
@@ -47,8 +47,8 @@
};
}
-static bool PrintInsts(const llvm::MCDisassembler &DisAsm,
- llvm::MCInstPrinter &Printer, const ByteArrayTy &Bytes,
+static bool PrintInsts(const MCDisassembler &DisAsm,
+ MCInstPrinter &Printer, const ByteArrayTy &Bytes,
SourceMgr &SM) {
// Wrap the vector in a MemoryObject.
VectorMemoryObject memoryObject(Bytes);
@@ -77,24 +77,23 @@
}
int Disassembler::disassemble(const Target &T, const std::string &Triple,
- MemoryBuffer &Buffer) {
+ MemoryBuffer &Buffer) {
// Set up disassembler.
- llvm::OwningPtr<const llvm::MCAsmInfo> AsmInfo(T.createAsmInfo(Triple));
+ OwningPtr<const MCAsmInfo> AsmInfo(T.createAsmInfo(Triple));
if (!AsmInfo) {
errs() << "error: no assembly info for target " << Triple << "\n";
return -1;
}
- llvm::OwningPtr<const llvm::MCDisassembler> DisAsm(T.createMCDisassembler());
+ OwningPtr<const MCDisassembler> DisAsm(T.createMCDisassembler());
if (!DisAsm) {
errs() << "error: no disassembler for target " << Triple << "\n";
return -1;
}
- llvm::MCInstPrinter *InstPrinter = T.createMCInstPrinter(0, *AsmInfo, outs());
-
- if (!InstPrinter) {
+ OwningPtr<MCInstPrinter> IP(T.createMCInstPrinter(0, *AsmInfo, outs()));
+ if (!IP) {
errs() << "error: no instruction printer for target " << Triple << '\n';
return -1;
}
@@ -151,7 +150,7 @@
}
if (!ByteArray.empty())
- ErrorOccurred |= PrintInsts(*DisAsm, *InstPrinter, ByteArray, SM);
+ ErrorOccurred |= PrintInsts(*DisAsm, *IP, ByteArray, SM);
return ErrorOccurred;
}
More information about the llvm-commits
mailing list