1 files changed, 7 insertions, 20 deletions

diff --git a/include/lldb/Breakpoint/BreakpointResolverName.h b/include/lldb/Breakpoint/BreakpointResolverName.h
index aaae9c1a12cfe..a11359dd00942 100644
--- a/include/lldb/Breakpoint/BreakpointResolverName.h
+++ b/include/lldb/Breakpoint/BreakpointResolverName.h
@@ -18,6 +18,7 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Breakpoint/BreakpointResolver.h"
+#include "lldb/Core/Module.h"
 
 namespace lldb_private {
 
@@ -37,6 +38,7 @@ public:
                             uint32_t name_type_mask,
                             lldb::LanguageType language,
                             Breakpoint::MatchType type,
+                            lldb::addr_t offset,
                             bool skip_prologue);
 
     // This one takes an array of names.  It is always MatchType = Exact.
@@ -45,6 +47,7 @@ public:
                             size_t num_names,
                             uint32_t name_type_mask,
                             lldb::LanguageType language,
+                            lldb::addr_t offset,
                             bool skip_prologue);
 
     // This one takes a C++ array of names.  It is always MatchType = Exact.
@@ -52,18 +55,21 @@ public:
                             std::vector<std::string> names,
                             uint32_t name_type_mask,
                             lldb::LanguageType language,
+                            lldb::addr_t offset,
                             bool skip_prologue);
 
     // Creates a function breakpoint by regular expression.  Takes over control of the lifespan of func_regex.
     BreakpointResolverName (Breakpoint *bkpt,
                             RegularExpression &func_regex,
                             lldb::LanguageType language,
+                            lldb::addr_t offset,
                             bool skip_prologue);
 
     BreakpointResolverName (Breakpoint *bkpt,
                             const char *class_name,
                             const char *method,
                             Breakpoint::MatchType type,
+                            lldb::addr_t offset,
                             bool skip_prologue);
 
     ~BreakpointResolverName() override;
@@ -95,26 +101,7 @@ public:
 protected:
     BreakpointResolverName(const BreakpointResolverName &rhs);
 
-    struct LookupInfo
-    {
-        ConstString name;
-        ConstString lookup_name;
-        uint32_t name_type_mask; // See FunctionNameType
-        bool match_name_after_lookup;
-        
-        LookupInfo () :
-            name(),
-            lookup_name(),
-            name_type_mask (0),
-            match_name_after_lookup (false)
-        {
-        }
-        
-        void
-        Prune (SymbolContextList &sc_list,
-               size_t start_idx) const;
-    };
-    std::vector<LookupInfo> m_lookups;
+    std::vector<Module::LookupInfo> m_lookups;
     ConstString m_class_name;
     RegularExpression m_regex;
     Breakpoint::MatchType m_match_type;