[lldb-mi] Fix setting of breakpoints using file:func syntax.

[dawn]

Summary

Given eBreakPoint_ByFileFn, code previously was calling:

sbTarget.BreakpointCreateByName(strFileFn.c_str(), fileName.c_str());

which calls the overload:

lldb::SBBreakpoint
BreakpointCreateByName (const char *symbol_name, const char *module_name = NULL);

but the module_name is expected to be the exe or dll here, i.e. for -break-insert a.out:func which isn't a valid use of -break-insert in gdb.

This patch calls the correct overload:

lldb::SBBreakpoint
BreakpointCreateByName (const char *symbol_name,
                        const SBFileSpecList &module_list,
                        const SBFileSpecList &comp_unit_list);

Comments were added to the tests for cases that won't work due to bugs in lldb.

[ki.stfu]

test/tools/lldb-mi/breakpoint/TestMiBreak.py

91 ↗

(On Diff #30623)

remove please

[dawn]

Line removed as requested.

[dawn]

Removed duplicate test for "::main" which was already added in http://reviews.llvm.org/D11396.

lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py

def test_lldbmi_break_insert_file_line(self):
 
         # Test that -break-insert fails if non-pending BP can't be resolved
         self.runCmd("-break-insert unknown_file:1")
         self.expect("\^error,msg=\"Command 'break-insert'. Breakpoint location 'unknown_file:1' not found\"")
 
         # Test that non-pending BP was set correctly
         self.runCmd("-exec-continue")
         self.expect("\^running")
-        self.expect("\*stopped,reason=\"breakpoint-hit\"")
+        self.expect("\*stopped,reason=\"breakpoint-hit\".*bkptno=\"2\"")
+
+        # Test that we can set a BP using the file:func syntax
+        self.runCmd("-break-insert main.cpp:main")
+        self.expect("\^done,bkpt={number=\"4\"")
+        self.runCmd("-break-insert main.cpp:ns::foo1")
+        self.expect("\^done,bkpt={number=\"5\"")
+        #FIXME: quotes on filenames aren't handled correctly in lldb-mi.
+        #self.runCmd("-break-insert \"main.cpp\":main")
+        #self.expect("\^done,bkpt={number=\"6\"")
+        #FIXME: this test is disabled due to lldb bug llvm.org/pr24271.
+        # Test that we can set a BP using the global namespace token
+        #self.runCmd("-break-insert \"main.cpp:::main\"")
+        #self.expect("\^done,bkpt={number=\"7\"")
+
+        # We should hit BP #5 on 'main.cpp:ns::foo1'
+        self.runCmd("-exec-continue")
+        self.expect("\^running")
+        self.expect("\*stopped,reason=\"breakpoint-hit\".*bkptno=\"5\"")
 
     @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @unittest2.expectedFailure("-break-insert doesn't work for absolute path")
     def test_lldbmi_break_insert_file_line_absolute_path(self):
         """Test that 'lldb-mi --interpreter' works for file:line breakpoints."""
 

lldb/trunk/tools/lldb-mi/MICmdCmdBreak.cpp

CMICmdCmdBreakInsert::Execute(void)
     CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance());
     lldb::SBTarget sbTarget = rSessionInfo.GetTarget();
     switch (eBrkPtType)
     {
         case eBreakPoint_ByAddress:
             m_brkPt = sbTarget.BreakpointCreateByAddress(nAddress);
             break;
         case eBreakPoint_ByFileFn:
-            m_brkPt = sbTarget.BreakpointCreateByName(strFileFn.c_str(), fileName.c_str());
+        {
+            lldb::SBFileSpecList module;    // search in all modules
+            lldb::SBFileSpecList compUnit;
+            compUnit.Append (lldb::SBFileSpec(fileName.c_str()));
+            m_brkPt = sbTarget.BreakpointCreateByName(strFileFn.c_str(), module, compUnit);
             break;
+        }
         case eBreakPoint_ByFileLine:
             m_brkPt = sbTarget.BreakpointCreateByLocation(fileName.c_str(), nFileLine);
             break;
         case eBreakPoint_ByName:
             m_brkPt = sbTarget.BreakpointCreateByName(m_brkName.c_str(), nullptr);
             break;
         case eBreakPoint_count:
         case eBreakPoint_NotDefineYet: