diff options
| author | Fangrui Song <maskray@google.com> | 2020-01-11 12:36:13 -0800 | 
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2020-01-11 13:34:52 -0800 | 
| commit | 6fdd6a7b3f696972edc244488f59532d05136a27 (patch) | |
| tree | dc7e353f873ffc0db7bae27ad8631a93ba9ac321 /llvm/lib/MC/MCDisassembler | |
| parent | 2cdb18afda841392002feafda21af31854c195b3 (diff) | |
| download | bcm5719-llvm-6fdd6a7b3f696972edc244488f59532d05136a27.tar.gz bcm5719-llvm-6fdd6a7b3f696972edc244488f59532d05136a27.zip  | |
[Disassembler] Delete the VStream parameter of MCDisassembler::getInstruction()
The argument is llvm::null() everywhere except llvm::errs() in
llvm-objdump in -DLLVM_ENABLE_ASSERTIONS=On builds. It is used by no
target but X86 in -DLLVM_ENABLE_ASSERTIONS=On builds.
If we ever have the needs to add verbose log to disassemblers, we can
record log with a member function, instead of passing it around as an
argument.
Diffstat (limited to 'llvm/lib/MC/MCDisassembler')
| -rw-r--r-- | llvm/lib/MC/MCDisassembler/Disassembler.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/MC/MCDisassembler/MCDisassembler.cpp | 7 | 
2 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/MC/MCDisassembler/Disassembler.cpp b/llvm/lib/MC/MCDisassembler/Disassembler.cpp index 507c30c9cb4..ff56695e8cc 100644 --- a/llvm/lib/MC/MCDisassembler/Disassembler.cpp +++ b/llvm/lib/MC/MCDisassembler/Disassembler.cpp @@ -263,8 +263,7 @@ size_t LLVMDisasmInstruction(LLVMDisasmContextRef DCR, uint8_t *Bytes,    MCDisassembler::DecodeStatus S;    SmallVector<char, 64> InsnStr;    raw_svector_ostream Annotations(InsnStr); -  S = DisAsm->getInstruction(Inst, Size, Data, PC, -                             /*REMOVE*/ nulls(), Annotations); +  S = DisAsm->getInstruction(Inst, Size, Data, PC, Annotations);    switch (S) {    case MCDisassembler::Fail:    case MCDisassembler::SoftFail: diff --git a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp index 96c1643b1e7..373916fbed7 100644 --- a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp +++ b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp @@ -16,9 +16,10 @@ using namespace llvm;  MCDisassembler::~MCDisassembler() = default; -MCDisassembler::DecodeStatus MCDisassembler::onSymbolStart( -    StringRef Name, uint64_t &Size, ArrayRef<uint8_t> Bytes, uint64_t Address, -    raw_ostream &VStream, raw_ostream &CStream) const { +MCDisassembler::DecodeStatus +MCDisassembler::onSymbolStart(StringRef Name, uint64_t &Size, +                              ArrayRef<uint8_t> Bytes, uint64_t Address, +                              raw_ostream &CStream) const {    Size = 0;    return MCDisassembler::Success;  }  | 

