From 706b4fc47bbc608932d3b491ae19a3b9cde9497b Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Fri, 17 Jan 2020 20:45:01 +0000 Subject: Vendor import of llvm-project master e26a78e70, the last commit before the llvmorg-11-init tag, from which release/10.x was branched. --- llvm/lib/MC/MCDisassembler/MCDisassembler.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'llvm/lib/MC/MCDisassembler/MCDisassembler.cpp') diff --git a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp index 063f7e706024b..373916fbed785 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 Bytes, uint64_t Address, - raw_ostream &VStream, raw_ostream &CStream) const { +MCDisassembler::DecodeStatus +MCDisassembler::onSymbolStart(StringRef Name, uint64_t &Size, + ArrayRef Bytes, uint64_t Address, + raw_ostream &CStream) const { Size = 0; return MCDisassembler::Success; } @@ -27,18 +28,16 @@ bool MCDisassembler::tryAddingSymbolicOperand(MCInst &Inst, int64_t Value, uint64_t Address, bool IsBranch, uint64_t Offset, uint64_t InstSize) const { - raw_ostream &cStream = CommentStream ? *CommentStream : nulls(); if (Symbolizer) - return Symbolizer->tryAddingSymbolicOperand(Inst, cStream, Value, Address, - IsBranch, Offset, InstSize); + return Symbolizer->tryAddingSymbolicOperand( + Inst, *CommentStream, Value, Address, IsBranch, Offset, InstSize); return false; } void MCDisassembler::tryAddingPcLoadReferenceComment(int64_t Value, uint64_t Address) const { - raw_ostream &cStream = CommentStream ? *CommentStream : nulls(); if (Symbolizer) - Symbolizer->tryAddingPcLoadReferenceComment(cStream, Value, Address); + Symbolizer->tryAddingPcLoadReferenceComment(*CommentStream, Value, Address); } void MCDisassembler::setSymbolizer(std::unique_ptr Symzer) { -- cgit v1.2.3