Added the ability to restrict breakpoints by function name, function regexp, selector

etc to specific source files.
Added SB API's to specify these source files & also more than one module.
Added an "exact" option to CompileUnit's FindLineEntry API.

llvm-svn: 140362

Author: jimingham

lldb/include/lldb/API/SBCompileUnit.h

@@ -47,6 +47,12 @@ class SBCompileUnit
                         uint32_t line,
                         lldb::SBFileSpec *inline_file_spec) const;
 
+    uint32_t
+    FindLineEntryIndex (uint32_t start_idx,
+                        uint32_t line,
+                        lldb::SBFileSpec *inline_file_spec,
+                        bool exact) const;
+
 #ifndef SWIG
 
     bool

lldb/include/lldb/API/SBFileSpecList.h

@@ -44,13 +44,15 @@ class SBFileSpecList
     Clear();
 
     uint32_t
-    FindFileIndex (uint32_t idx, const SBFileSpec &sb_file);
+    FindFileIndex (uint32_t idx, const SBFileSpec &sb_file, bool full);
 
     const SBFileSpec
     GetFileSpecAtIndex (uint32_t idx) const;
 
 private:
 
+friend class SBTarget;
+
 #ifndef SWIG
 
     const lldb_private::FileSpecList *

lldb/include/lldb/API/SBTarget.h

@@ -14,6 +14,7 @@
 #include "lldb/API/SBAddress.h"
 #include "lldb/API/SBBroadcaster.h"
 #include "lldb/API/SBFileSpec.h"
+#include "lldb/API/SBFileSpecList.h"
 #include "lldb/API/SBType.h"
 
 namespace lldb {
@@ -314,11 +315,28 @@ class SBTarget
     lldb::SBBreakpoint
     BreakpointCreateByName (const char *symbol_name, const char *module_name = NULL);
 
+    lldb::SBBreakpoint
+    BreakpointCreateByName (const char *symbol_name, 
+                            const SBFileSpecList &module_list, 
+                            const SBFileSpecList &comp_unit_list);
+
     lldb::SBBreakpoint
     BreakpointCreateByRegex (const char *symbol_name_regex, const char *module_name = NULL);
 
     lldb::SBBreakpoint
-    BreakpointCreateBySourceRegex (const char *source_regex, const lldb::SBFileSpec &source_file, const char *module_name = NULL);
+    BreakpointCreateByRegex (const char *symbol_name_regex, 
+                             const SBFileSpecList &module_list, 
+                             const SBFileSpecList &comp_unit_list);
+    
+    lldb::SBBreakpoint
+    BreakpointCreateBySourceRegex (const char *source_regex, 
+                                   const lldb::SBFileSpec &source_file, 
+                                   const char *module_name = NULL);
+
+    lldb::SBBreakpoint
+    BreakpointCreateBySourceRegex (const char *source_regex, 
+                                   const SBFileSpecList &module_list, 
+                                   const lldb::SBFileSpecList &source_file);
 
     lldb::SBBreakpoint
     BreakpointCreateByAddress (addr_t address);

lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h

@@ -29,7 +29,6 @@ class BreakpointResolverFileRegex :
 {
 public:
     BreakpointResolverFileRegex (Breakpoint *bkpt,
-                                const FileSpec &resolver,
                                 RegularExpression &regex);
 
     virtual
@@ -58,8 +57,7 @@ class BreakpointResolverFileRegex :
 
 protected:
     friend class Breakpoint;
-    FileSpec m_file_spec; // This is the file spec we are looking for.
-    RegularExpression m_regex; // This is the line number that we are looking for.
+    RegularExpression m_regex; // This is the line expression that we are looking for.
 
 private:
     DISALLOW_COPY_AND_ASSIGN(BreakpointResolverFileRegex);

lldb/include/lldb/Core/FileSpecList.h

@@ -116,12 +116,15 @@ class FileSpecList
     /// @param[in] file
     ///     The file specification to search for.
     ///
+    /// @param[in] full
+    ///     Should FileSpec::Equal be called with "full" true or false.
+    ///
     /// @return
     ///     The index of the file that matches \a file if it is found,
     ///     else UINT32_MAX is returned.
     //------------------------------------------------------------------
     uint32_t
-    FindFileIndex (uint32_t idx, const FileSpec &file) const;
+    FindFileIndex (uint32_t idx, const FileSpec &file, bool full) const;
 
     //------------------------------------------------------------------
     /// Get file at index.

lldb/include/lldb/Core/SearchFilter.h

@@ -216,6 +216,21 @@ class SearchFilter
     virtual void
     SearchInModuleList (Searcher &searcher, ModuleList &modules);
 
+    //------------------------------------------------------------------
+    /// This determines which items are REQUIRED for the filter to pass.
+    /// For instance, if you are filtering by Compilation Unit, obviously
+    /// symbols that have no compilation unit can't pass  So return eSymbolContextCU
+    /// and search callbacks can then short cut the search to avoid looking at
+    /// things that obviously won't pass.
+    ///
+    /// @return
+    ///    The required elements for the search, which is an or'ed together
+    ///    set of lldb:SearchContextItem enum's.
+    ///
+    //------------------------------------------------------------------
+    virtual uint32_t
+    GetFilterRequiredItems ();
+
     //------------------------------------------------------------------
     /// Prints a canonical description for the search filter to the stream \a s.
     ///
@@ -311,6 +326,9 @@ class SearchFilterByModule :
     virtual void
     GetDescription(Stream *s);
 
+    virtual uint32_t
+    GetFilterRequiredItems ();
+
     virtual void
     Dump (Stream *s) const;
 
@@ -369,6 +387,65 @@ class SearchFilterByModuleList :
     virtual void
     GetDescription(Stream *s);
 
+    virtual uint32_t
+    GetFilterRequiredItems ();
+
+    virtual void
+    Dump (Stream *s) const;
+    
+    virtual void
+    Search (Searcher &searcher);
+
+private:
+    FileSpecList m_module_spec_list;
+};
+
+class SearchFilterByModuleListAndCU :
+    public SearchFilterByModuleList
+{
+public:
+
+    //------------------------------------------------------------------
+    /// The basic constructor takes a Target, which gives the space to search,
+    /// and the module list to restrict the search to.
+    ///
+    /// @param[in] target
+    ///    The Target that provides the module list to search.
+    ///
+    /// @param[in] module
+    ///    The Module that limits the search.
+    //------------------------------------------------------------------
+    SearchFilterByModuleListAndCU (lldb::TargetSP &targetSP,
+                          const FileSpecList &module_list,
+                          const FileSpecList &cu_list);
+
+    SearchFilterByModuleListAndCU (const SearchFilterByModuleListAndCU& rhs);
+
+    virtual
+    ~SearchFilterByModuleListAndCU ();
+
+    const SearchFilterByModuleListAndCU&
+    operator=(const SearchFilterByModuleListAndCU& rhs);
+
+    virtual bool
+    SymbolContextPasses (const SymbolContext &context,
+                         lldb::SymbolContextItem scope);
+
+    virtual bool
+    AddressPasses (Address &address);
+
+    virtual bool
+    CompUnitPasses (FileSpec &fileSpec);
+
+    virtual bool
+    CompUnitPasses (CompileUnit &compUnit);
+
+    virtual void
+    GetDescription(Stream *s);
+
+    virtual uint32_t
+    GetFilterRequiredItems ();
+
     virtual void
     Dump (Stream *s) const;
 
@@ -377,6 +454,7 @@ class SearchFilterByModuleList :
 
 private:
     FileSpecList m_module_spec_list;
+    FileSpecList m_cu_spec_list;
 };
 
 } // namespace lldb_private

lldb/include/lldb/Symbol/CompileUnit.h

@@ -202,6 +202,10 @@ class CompileUnit :
     ///     else if NULL, search for line entries that match the compile
     ///     unit file.
     ///
+    /// @param[in] exact
+    ///     If \btrue match only if there is a line table entry for this line number.
+    ///     If \bfalse, find the line table entry equal to or after this line number.
+    ///
     /// @param[out] line_entry
     ///     If non-NULL, a copy of the line entry that was found.
     ///
@@ -213,6 +217,7 @@ class CompileUnit :
     FindLineEntry (uint32_t start_idx,
                    uint32_t line,
                    const FileSpec* file_spec_ptr,
+                   bool exact,
                    LineEntry *line_entry);
 
     //------------------------------------------------------------------

lldb/include/lldb/Target/Target.h

@@ -250,10 +250,10 @@ class Target :
                       bool check_inlines,
                       bool internal = false);
 
-    // Use this to create breakpoint that matches regex against the source lines in file:
+    // Use this to create breakpoint that matches regex against the source lines in files given in source_file_list:
     lldb::BreakpointSP
-    CreateBreakpoint (const FileSpecList *containingModules,
-                      const FileSpec &file,
+    CreateSourceRegexBreakpoint (const FileSpecList *containingModules,
+                      const FileSpecList *source_file_list,
                       RegularExpression &source_regex,
                       bool internal = false);
 
@@ -267,11 +267,12 @@ class Target :
     CreateBreakpoint (Address &addr,
                       bool internal = false);
 
-    // Use this to create a function breakpoint by regexp in containingModule, or all modules if it is NULL
+    // Use this to create a function breakpoint by regexp in containingModule/containingSourceFiles, or all modules if it is NULL
     // When "skip_prologue is set to eLazyBoolCalculate, we use the current target 
     // setting, else we use the values passed in
     lldb::BreakpointSP
-    CreateBreakpoint (const FileSpecList *containingModules,
+    CreateFuncRegexBreakpoint (const FileSpecList *containingModules,
+                      const FileSpecList *containingSourceFiles,
                       RegularExpression &func_regexp,
                       bool internal = false,
                       LazyBool skip_prologue = eLazyBoolCalculate);
@@ -281,6 +282,7 @@ class Target :
     // setting, else we use the values passed in
     lldb::BreakpointSP
     CreateBreakpoint (const FileSpecList *containingModules,
+                      const FileSpecList *containingSourceFiles,
                       const char *func_name,
                       uint32_t func_name_type_mask, 
                       bool internal = false,
@@ -889,6 +891,10 @@ class Target :
 
     lldb::SearchFilterSP
     GetSearchFilterForModuleList (const FileSpecList *containingModuleList);
+    
+    lldb::SearchFilterSP
+    GetSearchFilterForModuleAndCUList (const FileSpecList *containingModules, const FileSpecList *containingSourceFiles);
+
 
     static void
     ImageSearchPathsChanged (const PathMappingList &path_list,

lldb/scripts/Python/interface/SBCompileUnit.i

@@ -71,6 +71,12 @@ public:
                         uint32_t line,
                         lldb::SBFileSpec *inline_file_spec) const;
 
+    uint32_t
+    FindLineEntryIndex (uint32_t start_idx,
+                        uint32_t line,
+                        lldb::SBFileSpec *inline_file_spec,
+			bool exact) const;
+
     bool
     GetDescription (lldb::SBStream &description);
 };

lldb/scripts/Python/interface/SBFileSpecList.i

@@ -34,7 +34,7 @@ public:
     Clear();
 
     uint32_t
-    FindFileIndex (uint32_t idx, const SBFileSpec &sb_file);
+    FindFileIndex (uint32_t idx, const SBFileSpec &sb_file, bool full);
 
     const SBFileSpec
     GetFileSpecAtIndex (uint32_t idx) const;

lldb/source/API/SBCompileUnit.cpp

@@ -98,6 +98,13 @@ SBCompileUnit::GetLineEntryAtIndex (uint32_t idx) const
 
 uint32_t
 SBCompileUnit::FindLineEntryIndex (uint32_t start_idx, uint32_t line, SBFileSpec *inline_file_spec) const
+{
+    const bool exact = true;
+    return FindLineEntryIndex (start_idx, line, inline_file_spec, exact);
+}
+
+uint32_t
+SBCompileUnit::FindLineEntryIndex (uint32_t start_idx, uint32_t line, SBFileSpec *inline_file_spec, bool exact) const
 {
     LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -114,6 +121,7 @@ SBCompileUnit::FindLineEntryIndex (uint32_t start_idx, uint32_t line, SBFileSpec
         index = m_opaque_ptr->FindLineEntry (start_idx,
                                              line,
                                              inline_file_spec ? inline_file_spec->get() : NULL,
+                                             exact,
                                              NULL);
     }
 

lldb/source/API/SBFileSpecList.cpp

@@ -80,9 +80,9 @@ SBFileSpecList::Clear()
 }
 
 uint32_t
-SBFileSpecList::FindFileIndex (uint32_t idx, const SBFileSpec &sb_file)
+SBFileSpecList::FindFileIndex (uint32_t idx, const SBFileSpec &sb_file, bool full)
 {
-    return m_opaque_ap->FindFileIndex (idx, sb_file.ref());
+    return m_opaque_ap->FindFileIndex (idx, sb_file.ref(), full);
 }
 
 const SBFileSpec