Handle PyLong return values in LLDBSwigPython_CalculateNumChildren.

[sivachandra]

Summary

Also, change its return type to size_t to match the return types of
its callers.

With this change, std::vector and std::list data formatter tests
pass on Linux (when using libstdc++) with clang as well as with gcc.
These tests have also been enabled in this patch.

[zturner]

scripts/Python/python-wrapper.swig

651

I think the preprocessor directives should be aligned to column 0, not to the current level of indentation. Same goes for later in the function.

[clayborg]

Looks good, just fix the preprocessor indent and you are good to go.

[sivachandra]

Fix indentation of the preprocessor directives.

[vharron]

test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile

12

I think you'll need to replace this with the equivalent -fno-limit-debug-info, which is also understood by clang-3.4 on the debian builder.

[vharron]

test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile

9

You might want to remove the extra #s while you're in there.

[sivachandra]

test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile

12

OK. I just copy-pasted the state of that day's art from another Makefile. I will take care of this today.

include/lldb/Interpreter/ScriptInterpreter.h

typedef void* (*SWIGPythonCreateScriptedThreadPlan) (const char *python_class_name,
                                                         const lldb::ThreadPlanSP& thread_plan_sp);
 
     typedef bool (*SWIGPythonCallThreadPlan) (void *implementor, const char *method_name, Event *event_sp, bool &got_error);
 
     typedef void* (*SWIGPythonCreateOSPlugin) (const char *python_class_name,
                                                const char *session_dictionary_name,
                                                const lldb::ProcessSP& process_sp);
     
-    typedef uint32_t        (*SWIGPythonCalculateNumChildren)                   (void *implementor);
+    typedef size_t          (*SWIGPythonCalculateNumChildren)                   (void *implementor);
     typedef void*           (*SWIGPythonGetChildAtIndex)                        (void *implementor, uint32_t idx);
     typedef int             (*SWIGPythonGetIndexOfChildWithName)                (void *implementor, const char* child_name);
     typedef void*           (*SWIGPythonCastPyObjectToSBValue)                  (void* data);
     typedef lldb::ValueObjectSP  (*SWIGPythonGetValueObjectSPFromSBValue)       (void* data);
     typedef bool            (*SWIGPythonUpdateSynthProviderInstance)            (void* data);
     typedef bool            (*SWIGPythonMightHaveChildrenSynthProviderInstance) (void* data);
     typedef void*           (*SWIGPythonGetValueSynthProviderInstance)          (void *implementor);
     

scripts/Python/python-wrapper.swig

)
 
     if (was_found)
         *was_found = true;
 
     PyObject* py_return = pfunc();
     return py_return;
 }
 
-SWIGEXPORT uint32_t
+SWIGEXPORT size_t
 LLDBSwigPython_CalculateNumChildren
 (
     PyObject *implementor
 )
 {
-    uint32_t ret_val = UINT32_MAX;
+    size_t ret_val = UINT32_MAX;
+    bool int_match = false;
 
     static char callee_name[] = "num_children";
 
     PyObject* py_return = LLDBSwigPython_CallOptionalMember(implementor,callee_name, NULL);
 
     if (!py_return)
         return ret_val;
 
-    if (PyInt_Check(py_return))
-        ret_val = PyInt_AsLong(py_return);
+    // PyInt_* are not available for Python 3 and above.
+#if PY_MAJOR_VERSION < 3
+    if (PyInt_Check (py_return))
+    {
+        int_match = true;
+        ret_val = static_cast<size_t> (PyInt_AsLong (py_return));
+    }
+#endif
+
+    // We want to check for PyLong only if the return value did not
+    // match PyInt. This is because we do not want to call PyLong_Check if
+    // PyInt_Check returns true but PyInt_AsLong generates an error.
+    if (!int_match && PyLong_Check (py_return))
+    {
+#if PY_MAJOR_VERSION < 3
+        ret_val = static_cast<size_t> (PyLong_AsUnsignedLong (py_return));
+#else
+        // PyLong_AsSize_t is available only for Python 3 and above.
+        ret_val = PyLong_AsSize_t (py_return);
+#endif
+    }
 
     Py_XDECREF(py_return);
 
     if (PyErr_Occurred())
     {
         PyErr_Print();
         PyErr_Clear();
     }

source/API/SBCommandInterpreter.cpp

LLDBSwigPythonCreateScriptedThreadPlan (const char *python_class_name,
                                         const lldb::ThreadPlanSP& thread_plan_sp);
 
 extern "C" bool
 LLDBSWIGPythonCallThreadPlan (void *implementor,
                               const char *method_name,
                               Event *event_sp,
                               bool &got_error);
 
-extern "C" uint32_t
+extern "C" size_t
 LLDBSwigPython_CalculateNumChildren (void *implementor);
 
 extern "C" void *
 LLDBSwigPython_GetChildAtIndex (void *implementor, uint32_t idx);
 
 extern "C" int
 LLDBSwigPython_GetIndexOfChildWithName (void *implementor, const char* child_name);
 

source/Interpreter/ScriptInterpreterPython.cpp

ScriptInterpreterPython::CalculateNumChildren (const lldb::ScriptInterpreterObjectSP& implementor_sp)
     void* implementor = implementor_sp->GetObject();
     
     if (!implementor)
         return 0;
     
     if (!g_swig_calc_children)
         return 0;
 
-    uint32_t ret_val = 0;
+    size_t ret_val = 0;
     
     {
         Locker py_lock(this, Locker::AcquireLock | Locker::InitSession | Locker::NoSTDIN);
         ret_val = g_swig_calc_children (implementor);
     }
     
     return ret_val;
 }

test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py

class StdListDataFormatterTestCase(TestBase):
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test data formatter commands."""
         self.buildDsym()
         self.data_formatter_commands()
 
     @dwarf_test
     @expectedFailureFreeBSD("llvm.org/pr20548") # fails to build on lab.llvm.org buildbot
-    @expectedFailureLinux('llvm.org/pr15301', ['icc']) # LLDB prints incorrect sizes of STL containers
-    @expectedFailureGcc # llvm.org/pr17499 The data formatter cannot parse STL containers
     def test_with_dwarf_and_run_command(self):
         """Test data formatter commands."""
         self.buildDwarf()
         self.data_formatter_commands()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile

 LEVEL = ../../../../../make
 
 CXX_SOURCES := main.cpp
 
 CXXFLAGS := -O0
 USE_LIBSTDCPP := 1
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
+# # targets.  Other targets do not, which causes this test to fail.
+# # This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS += -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules

test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py

class StdVectorDataFormatterTestCase(TestBase):
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test data formatter commands."""
         self.buildDsym()
         self.data_formatter_commands()
 
     @dwarf_test
     @skipIfFreeBSD
-    @expectedFailureLinux # non-core functionality, need to reenable and fix
-                          # later (DES 2014.11.07). Most likely failing because
-                          # of mis-match is version of libstdc++ supported by
-                          # the data-formatters.
     @expectedFailureIcc # llvm.org/pr15301 LLDB prints incorrect sizes of STL containers
-    @expectedFailureGcc # llvm.org/pr17499 The data formatter cannot parse STL containers
     def test_with_dwarf_and_run_command(self):
         """Test data formatter commands."""
-        if "gcc" in self.getCompiler() and "4.8" in self.getCompilerVersion():
-            self.skipTest("llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
         self.buildDwarf()
         self.data_formatter_commands()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line number to break at.
         self.line = line_number('main.cpp', '// Set break point at this line.')