[llvm] 1ea5ce6 - [MC] Assume CommentStream is non-null in MCDisassembler::tryAdding*

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2019-12-15T16:21:06-08:00
New Revision: 1ea5ce6335c7c0e040f70de16f1080546d242b69

URL: https://github.com/llvm/llvm-project/commit/1ea5ce6335c7c0e040f70de16f1080546d242b69
DIFF: https://github.com/llvm/llvm-project/commit/1ea5ce6335c7c0e040f70de16f1080546d242b69.diff

LOG: [MC] Assume CommentStream is non-null in MCDisassembler::tryAdding*

AArch64/ARM/X86 call the two functions. CommentStream is always
initialized.

Added: 
    

Modified: 
    llvm/lib/MC/MCDisassembler/MCDisassembler.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp
index 063f7e706024..96c1643b1e7e 100644
--- a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp
+++ b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp
@@ -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) {