DisassembleRequestHandler address comparison workaround

Author: eronnen

lldb/test/API/tools/lldb-dap/disassemble/TestDAP_disassemble.py

@@ -20,7 +20,6 @@ def test_disassemble(self):
         program = self.getBuildArtifact("a.out")
         self.build_and_launch(program)
         source = "main.c"
-        self.source_path = os.path.join(os.getcwd(), source)
         self.set_source_breakpoints(source, [line_number(source, "// breakpoint 1")])
         self.continue_to_next_stop()
 

lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp

@@ -87,6 +87,13 @@ static DisassembledInstruction ConvertSBInstructionToDisassembledInstruction(
 
   auto addr = inst.GetAddress();
   const auto inst_addr = addr.GetLoadAddress(target);
+  
+  // FIXME: This is a workaround - this address might come from
+  // disassembly that started in a different section, and thus
+  // comparisons between this object and other address objects with the
+  // same load address will return false.
+  addr = lldb::SBAddress(inst_addr, target);
+
   const char *m = inst.GetMnemonic(target);
   const char *o = inst.GetOperands(target);
   const char *c = inst.GetComment(target);