vendor/lldb/lldb-trunk-r300422

2 files changed, 16 insertions, 6 deletions

diff --git a/scripts/interface/SBFrame.i b/scripts/interface/SBFrame.i
index 1c10a9b6e3e81..b8654cb0eb60a 100644
--- a/scripts/interface/SBFrame.i
+++ b/scripts/interface/SBFrame.i
@@ -133,6 +133,14 @@ public:
 
     const char *
     GetFunctionName() const;
+             
+    %feature("docstring", "
+    /// Returns the language of the frame's SBFunction, or if there.
+    /// is no SBFunction, guess the language from the mangled name.
+    /// .
+    ") GuessLanguage;
+    lldb::LanguageType
+    GuessLanguage() const;
 
     %feature("docstring", "
     /// Return true if this frame represents an inlined function.
diff --git a/scripts/interface/SBThread.i b/scripts/interface/SBThread.i
index 9aacb4374dccd..c36b1b519e664 100644
--- a/scripts/interface/SBThread.i
+++ b/scripts/interface/SBThread.i
@@ -182,12 +182,14 @@ public:
     lldb::queue_id_t
     GetQueueID() const;
 
-    %feature("autodoc", "
-    Takes a path string and a SBStream reference as parameters, returns a bool.  
-    Collects the thread's 'info' dictionary from the remote system, uses the path
-    argument to descend into the dictionary to an item of interest, and prints
-    it into the SBStream in a natural format.  Return bool is to indicate if
-    anything was printed into the stream (true) or not (false).
+    %feature("docstring", "
+    //--------------------------------------------------------------------------
+    /// Takes a path string and a SBStream reference as parameters, returns a bool.  
+    /// Collects the thread's 'info' dictionary from the remote system, uses the path
+    /// argument to descend into the dictionary to an item of interest, and prints
+    /// it into the SBStream in a natural format.  Return bool is to indicate if
+    /// anything was printed into the stream (true) or not (false).
+    //--------------------------------------------------------------------------
     ") GetInfoItemByPathAsString;
 
     bool