[MC] Assume CommentStream is non-null in MCDisassembler::tryAdding*
authorFangrui Song <maskray@google.com>
Mon, 16 Dec 2019 00:18:23 +0000 (16:18 -0800)
committerFangrui Song <maskray@google.com>
Mon, 16 Dec 2019 00:21:06 +0000 (16:21 -0800)
AArch64/ARM/X86 call the two functions. CommentStream is always
initialized.

llvm/lib/MC/MCDisassembler/MCDisassembler.cpp

index 063f7e7..96c1643 100644 (file)
@@ -27,18 +27,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<MCSymbolizer> Symzer) {