[source map] fix relative path breakpoints

[wallace]

Summary

https://reviews.llvm.org/D45592 added a nice feature to be able to specify a breakpoint by a relative path. E.g. passing foo.cpp or bar/foo.cpp or zaz/bar/foo.cpp is fine. However, https://reviews.llvm.org/D68671 by mistake disabled the test that ensured this functionality works. With time, someone made a small mistake and fully broke the functionality.

So, I'm making a very simple fix and the test passes.

[wallace]

add a comment

[clayborg]

Good catch!

lldb/source/Breakpoint/BreakpointResolverFileLine.cpp

for(uint32_t i = 0; i < sc_list.GetSize(); ++i) {
     // inline int foo1() { ... }
     // inline int foo2() { ... }
     //
     // but that's the best we can do for now.
     // One complication, if the line number returned from GetStartLineSourceInfo
     // is 0, then we can't do this calculation.  That can happen if
     // GetStartLineSourceInfo gets an error, or if the first line number in
     // the function really is 0 - which happens for some languages.
-    
     // But only do this calculation if the line number we found in the SC
     // was different from the one requested in the source file.  If we actually
     // found an exact match it must be valid.
 
     if (m_location_spec.GetLine() == sc.line_entry.line)
       continue;
 
     const int decl_line_is_too_late_fudge = 1;
Searcher::CallbackReturn BreakpointResolverFileLine::SearchCallback(
   // there may be many different file spec's in the resultant list.  The
   // closest line match for one will not be right for some totally different
   // file.  So we go through the match list and pull out the sets that have the
   // same file spec in their line_entry and treat each set separately.
 
   const uint32_t line = m_location_spec.GetLine().getValueOr(0);
   const llvm::Optional<uint16_t> column = m_location_spec.GetColumn();
 
+  // We'll create a new SourceLocationSpec that can take into account the
+  // relative path case, and we'll use it to resolve the symbol context
+  // of the CUs.
   FileSpec search_file_spec = m_location_spec.GetFileSpec();
   const bool is_relative = search_file_spec.IsRelative();
   if (is_relative)
     search_file_spec.GetDirectory().Clear();
+  SourceLocationSpec search_location_spec(
+      search_file_spec, m_location_spec.GetLine().getValueOr(0),
+      m_location_spec.GetColumn(), m_location_spec.GetCheckInlines(),
+      m_location_spec.GetExactMatch());
 
   const size_t num_comp_units = context.module_sp->GetNumCompileUnits();
   for (size_t i = 0; i < num_comp_units; i++) {
     CompUnitSP cu_sp(context.module_sp->GetCompileUnitAtIndex(i));
     if (cu_sp) {
       if (filter.CompUnitPasses(*cu_sp))
-        cu_sp->ResolveSymbolContext(m_location_spec, eSymbolContextEverything,
-                                    sc_list);
+        cu_sp->ResolveSymbolContext(search_location_spec,
+                                    eSymbolContextEverything, sc_list);
     }
   }
 
   FilterContexts(sc_list, is_relative);
 
   StreamString s;
   s.Printf("for %s:%d ",
            m_location_spec.GetFileSpec().GetFilename().AsCString("<Unknown>"),

lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py

 
 class BreakpointCommandTestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528")
     @skipIfReproducer # side_effect bypasses reproducer
-    def not_test_breakpoint_command_sequence(self):
+    def test_breakpoint_command_sequence(self):
         """Test a sequence of breakpoint command add, list, and delete."""
         self.build()
         self.breakpoint_command_sequence()
 
     @skipIf(oslist=["windows"], bugnumber="llvm.org/pr44431")
     @skipIfReproducer # side_effect bypasses reproducer
     def test_script_parameters(self):
         """Test a sequence of breakpoint command add, list, and delete."""
def test_breakpoint_delete_disabled(self):
         bp_3.AddName("DeleteMeNot")
 
         bp_1.SetEnabled(False)
         bp_3.SetEnabled(False)
 
         bp_id_1 = bp_1.GetID()
         bp_id_2 = bp_2.GetID()
         bp_id_3 = bp_3.GetID()
-        
         self.runCmd("breakpoint delete --disabled DeleteMeNot")
 
         bp_1 = target.FindBreakpointByID(bp_id_1)
         self.assertFalse(bp_1.IsValid(), "Didn't delete disabled breakpoint 1")
 
         bp_2 = target.FindBreakpointByID(bp_id_2)
         self.assertTrue(bp_2.IsValid(), "Deleted enabled breakpoint 2")
 
         bp_3 = target.FindBreakpointByID(bp_id_3)
         self.assertTrue(bp_3.IsValid(), "DeleteMeNot didn't protect disabled breakpoint 3")
 
         # Reset the first breakpoint, disable it, and do this again with no protected name:
         bp_1 = target.BreakpointCreateByName("main")
 
         bp_1.SetEnabled(False)
 
         bp_id_1 = bp_1.GetID()
-        
         self.runCmd("breakpoint delete --disabled")
 
         bp_1 = target.FindBreakpointByID(bp_id_1)
         self.assertFalse(bp_1.IsValid(), "Didn't delete disabled breakpoint 1")
 
         bp_2 = target.FindBreakpointByID(bp_id_2)
         self.assertTrue(bp_2.IsValid(), "Deleted enabled breakpoint 2")
 
         bp_3 = target.FindBreakpointByID(bp_id_3)
         self.assertFalse(bp_3.IsValid(), "Didn't delete disabled breakpoint 3")
-