[Lldb-commits] [lldb] r138105 - in /lldb/trunk: include/lldb/Interpreter/ScriptInterpreter.h scripts/Python/python-wrapper.swig source/API/SBCommandInterpreter.cpp source/Interpreter/ScriptInterpreterPython.cpp source/Target/StackFrame.cpp test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py

[Enrico Granata]

Author: enrico
Date: Fri Aug 19 16:56:10 2011
New Revision: 138105

URL: http://llvm.org/viewvc/llvm-project?rev=138105&view=rev
Log:
Taking care of an issue with using lldb_private types in SBCommandInterpreter.cpp ; Making NSString test case work on Snow Leopard ; Removing an unused variable warning

Modified:
    lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h
    lldb/trunk/scripts/Python/python-wrapper.swig
    lldb/trunk/source/API/SBCommandInterpreter.cpp
    lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
    lldb/trunk/source/Target/StackFrame.cpp
    lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py

Modified: lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h?rev=138105&r1=138104&r2=138105&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h (original)
+++ lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h Fri Aug 19 16:56:10 2011
@@ -49,7 +49,7 @@
                                                                      lldb::DebuggerSP& debugger,
                                                                      const char* args,
                                                                      std::string& err_msg,
-                                                                     lldb_private::CommandReturnObject& cmd_retobj);
+                                                                     void* cmd_retobj);
 
     typedef enum
     {

Modified: lldb/trunk/scripts/Python/python-wrapper.swig
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/python-wrapper.swig?rev=138105&r1=138104&r2=138105&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/python-wrapper.swig (original)
+++ lldb/trunk/scripts/Python/python-wrapper.swig Fri Aug 19 16:56:10 2011
@@ -590,11 +590,11 @@
     lldb::DebuggerSP& debugger,
     const char* args,
     std::string& err_msg,
-    lldb_private::CommandReturnObject& cmd_retobj
+    void* cmd_retobj
 )
 {
 
-    not_owning_ap<lldb_private::CommandReturnObject> auto_cmd_retobj(&cmd_retobj);
+    not_owning_ap<lldb_private::CommandReturnObject> auto_cmd_retobj((lldb_private::CommandReturnObject*)cmd_retobj);
 
     bool retval = false;
 

Modified: lldb/trunk/source/API/SBCommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBCommandInterpreter.cpp?rev=138105&r1=138104&r2=138105&view=diff
==============================================================================
--- lldb/trunk/source/API/SBCommandInterpreter.cpp (original)
+++ lldb/trunk/source/API/SBCommandInterpreter.cpp Fri Aug 19 16:56:10 2011
@@ -344,7 +344,7 @@
     lldb::DebuggerSP& debugger,
     const char* args,
     std::string& err_msg,
-    lldb_private::CommandReturnObject& cmd_retobj
+    void* cmd_retobj
 );
 
 

Modified: lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp?rev=138105&r1=138104&r2=138105&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp (original)
+++ lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp Fri Aug 19 16:56:10 2011
@@ -1946,7 +1946,7 @@
                                              debugger_sp,
                                              args,
                                              err_msg,
-                                             cmd_retobj);
+                                             (void*)&cmd_retobj);
         python_interpreter->LeaveSession ();
     }
     else
@@ -1960,7 +1960,7 @@
                                              debugger_sp,
                                              args,
                                              err_msg,
-                                             cmd_retobj);
+                                             (void*)&cmd_retobj);
         python_interpreter->LeaveSession ();
         ReleasePythonLock ();
     }

Modified: lldb/trunk/source/Target/StackFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrame.cpp?rev=138105&r1=138104&r2=138105&view=diff
==============================================================================
--- lldb/trunk/source/Target/StackFrame.cpp (original)
+++ lldb/trunk/source/Target/StackFrame.cpp Fri Aug 19 16:56:10 2011
@@ -526,7 +526,7 @@
         const bool check_ptr_vs_member = (options & eExpressionPathOptionCheckPtrVsMember) != 0;
         const bool no_fragile_ivar = (options & eExpressionPathOptionsNoFragileObjcIvar) != 0;
         const bool no_synth_child = (options & eExpressionPathOptionsNoSyntheticChildren) != 0;
-        const bool no_synth_array = (options & eExpressionPathOptionsNoSyntheticArrayRange) != 0;
+        //const bool no_synth_array = (options & eExpressionPathOptionsNoSyntheticArrayRange) != 0;
         error.Clear();
         bool deref = false;
         bool address_of = false;

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py?rev=138105&r1=138104&r2=138105&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py Fri Aug 19 16:56:10 2011
@@ -178,7 +178,7 @@
                                'inline = ',
                                'explicit = ',
                                'content = ',
-                               '__NSCFString'])
+                               'NSCFString'])
         
         self.expect('frame variable processName -P 1 -Y',
                     substrs = ['mutable =',
@@ -223,7 +223,7 @@
         self.expect('frame variable str10',
                     substrs = ['This is a Unicode string \\xcf\\x83 number 4 right here'])
         self.expect('frame variable str11',
-                    substrs = ['__NSCFString'])
+                    substrs = ['NSCFString'])
         self.expect('frame variable processName',
                     substrs = ['a.out'])        
         self.expect('frame variable str12',