Buildbot was failing to build. I guess classes declared in implementation files are treated differently on various compilers causing a "friend class Foo;" to fail for forward declared classes in global namespace.

llvm-svn: 176823

lldb/include/lldb/Target/LanguageRuntime.h

@@ -23,9 +23,6 @@
 #include "lldb/Core/Value.h"
 #include "lldb/Target/ExecutionContextScope.h"
 
-class ExceptionBreakpointResolver;
-class ExceptionSearchFilter;
-
 namespace lldb_private {
 
 class LanguageRuntime :
@@ -93,20 +90,18 @@ public:
     {
         return m_process;
     }
-        
-protected:
-    //------------------------------------------------------------------
-    // Classes that inherit from LanguageRuntime can see and modify these
-    //------------------------------------------------------------------
-    friend class ExceptionBreakpointResolver;
-    friend class ExceptionSearchFilter;
-    
+
     virtual lldb::BreakpointResolverSP
     CreateExceptionResolver (Breakpoint *bkpt, bool catch_bp, bool throw_bp) = 0;
     
     virtual lldb::SearchFilterSP
     CreateExceptionSearchFilter ();
 
+protected:
+    //------------------------------------------------------------------
+    // Classes that inherit from LanguageRuntime can see and modify these
+    //------------------------------------------------------------------
+    
     LanguageRuntime(Process *process);
     Process *m_process;
 private:

lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h

@@ -72,14 +72,15 @@ namespace lldb_private {
         
         virtual bool
         ExceptionBreakpointsExplainStop (lldb::StopInfoSP stop_reason);
-        
-    protected:
+
         virtual lldb::BreakpointResolverSP
         CreateExceptionResolver (Breakpoint *bkpt, bool catch_bp, bool throw_bp);
-
+        
         virtual lldb::SearchFilterSP
         CreateExceptionSearchFilter ();
 
+    protected:
+
         lldb::BreakpointResolverSP
         CreateExceptionResolver (Breakpoint *bkpt, bool catch_bp, bool throw_bp, bool for_expressions);
 

lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h

@@ -96,6 +96,10 @@ public:
     
     virtual bool
     ExceptionBreakpointsExplainStop (lldb::StopInfoSP stop_reason);
+    
+    virtual lldb::SearchFilterSP
+    CreateExceptionSearchFilter ();
+    
 protected:
     Address *
     GetPrintForDebuggerAddr();
@@ -106,9 +110,6 @@ protected:
     lldb::BreakpointSP m_objc_exception_bp_sp;
     lldb::ModuleWP m_objc_module_wp;
 
-    virtual lldb::SearchFilterSP
-    CreateExceptionSearchFilter ();
-    
     AppleObjCRuntime(Process *process) :
         lldb_private::ObjCLanguageRuntime(process),
         m_read_objc_library (false),