Consolidated DumpLocation and DumpLocationWithOptions using default DIDumpOptions instead of having to introduce new function

Author: UltimateForce21

lldb/include/lldb/Expression/DWARFExpression.h

@@ -157,8 +157,8 @@ class DWARFExpression {
     return data.GetByteSize() > 0;
   }
 
-  void DumpLocation(Stream *s, lldb::DescriptionLevel level, ABI *abi) const;
-  void DumpLocationWithOptions(Stream *s, lldb::DescriptionLevel level, ABI *abi, llvm::DIDumpOptions options) const;
+  void DumpLocation(Stream *s, lldb::DescriptionLevel level, ABI *abi,
+                    llvm::DIDumpOptions options = {}) const;
 
   bool MatchesOperand(StackFrame &frame, const Instruction::Operand &op) const;
 

lldb/source/Core/Disassembler.cpp

@@ -773,7 +773,7 @@ void Instruction::Dump(lldb_private::Stream *s, uint32_t max_opcode_byte_size,
           opts.ShowAddresses = false;
           opts.PrintRegisterOnly = true; // <-- important: suppress DW_OP_... annotations, etc.
 
-          entry.expr->DumpLocationWithOptions(&loc_str, eDescriptionLevelBrief, abi, opts);
+          entry.expr->DumpLocation(&loc_str, eDescriptionLevelBrief, abi, opts);
 
           // Only include if not empty.
           llvm::StringRef loc_clean = llvm::StringRef(loc_str.GetString()).trim();

lldb/source/Expression/DWARFExpression.cpp

@@ -66,12 +66,6 @@ void DWARFExpression::UpdateValue(uint64_t const_value,
 }
 
 void DWARFExpression::DumpLocation(Stream *s, lldb::DescriptionLevel level,
-                                   ABI *abi) const {
-  llvm::DIDumpOptions DumpOpts;
-  this->DumpLocationWithOptions(s, level, abi, DumpOpts);
-}
-
-void DWARFExpression::DumpLocationWithOptions(Stream *s, lldb::DescriptionLevel level,
                                    ABI *abi, llvm::DIDumpOptions options) const {
   auto *MCRegInfo = abi ? &abi->GetMCRegisterInfo() : nullptr;
   auto GetRegName = [&MCRegInfo](uint64_t DwarfRegNum,