Re: [Lldb-commits] [lldb] r285068 - Revert "Improve the libstdc++ smart pointer formatters"

2016-10-26 Thread Jim Ingham via lldb-commits 
For people who have a Mac and can make changes to the project files, we 
consider it polite and kind that they also fix up the project file when they 
add or remove source files.  But we also realize it isn't reasonable to require 
that somebody working on Linux, Windows, etc. have access to a Mac and know how 
to use Xcode.  So it's always been the policy that we watch these sorts of 
commits and fix them up if they need fixing.  If you don't have access to a 
Mac, it helps if you ping the list when you add or remove files; then we can 
get them fixed up w/o breaking any bots.

But there's no need to apologize.

Jim

> On Oct 26, 2016, at 4:03 AM, Pavel Labath via lldb-commits 
>  wrote:
> 
> Sorry, I forgot about the xcode project changes. I could have reverted
> those as well.
> 
> pl
> 
> On 25 October 2016 at 22:49, Tim Hammerquist  wrote:
>> Hi Pavel,
>> 
>> Looks like some code left after this revert is still expecting this file
>> (added contemporary to r284828) that was removed in this revision.
>> 
>> --- lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
>> (original)
>> +++ lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
>> (removed)
>> 
>> This is causing the build to break. Does this require additional changes, or
>> perhaps further reverts?
>> 
>> -Tim
>> 
>> 
>> On Tue, Oct 25, 2016 at 6:24 AM, Pavel Labath via lldb-commits
>>  wrote:
>>> 
>>> Author: labath
>>> Date: Tue Oct 25 08:24:53 2016
>>> New Revision: 285068
>>> 
>>> URL: http://llvm.org/viewvc/llvm-project?rev=285068&view=rev
>>> Log:
>>> Revert "Improve the libstdc++ smart pointer formatters"
>>> 
>>> This reverts commit r284828, as it causes an infinite loop in
>>> TestPrintStackTraces (funnily enough, only when logging is enabled).
>>> 
>>> Removed:
>>>lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
>>> Modified:
>>> 
>>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>>> 
>>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>>>lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt
>>>lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
>>> 
>>> Modified:
>>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile?rev=285068&r1=285067&r2=285068&view=diff
>>> 
>>> ==
>>> ---
>>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>>> (original)
>>> +++
>>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>>> Tue Oct 25 08:24:53 2016
>>> @@ -2,7 +2,14 @@ LEVEL = ../../../../../make
>>> 
>>> CXX_SOURCES := main.cpp
>>> 
>>> +CXXFLAGS := -O0
>>> USE_LIBSTDCPP := 1
>>> -CFLAGS_EXTRAS += $(NO_LIMIT_DEBUG_INFO_FLAGS)
>>> +
>>> +# 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 += -fno-limit-debug-info
>>> +endif
>>> 
>>> include $(LEVEL)/Makefile.rules
>>> 
>>> Modified:
>>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py?rev=285068&r1=285067&r2=285068&view=diff
>>> 
>>> ==
>>> ---
>>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>>> (original)
>>> +++
>>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>>> Tue Oct 25 08:24:53 2016
>>> @@ -31,58 +31,19 @@ class StdSmartPtrDataFormatterTestCase(T
>>> substrs=['stopped', 'stop reason = breakpoint'])
>>> 
>>> self.expect("frame variable nsp", substrs=['nsp = nullptr'])
>>> -self.expect("frame variable isp", substrs=['isp = 123',
>>> 'strong=1', 'weak=1'])
>>> -self.expect("frame variable ssp", substrs=['ssp = "foobar"',
>>> 'strong=1', 'weak=1'])
>>> -self.expect("frame variable nwp", substrs=['nwp = nullptr'])
>>> -self.expect("frame variable iwp", substrs=['iwp = 123',
>>> 'strong=1

Re: [Lldb-commits] [lldb] r285068 - Revert "Improve the libstdc++ smart pointer formatters"

2016-10-26 Thread Pavel Labath via lldb-commits 
Sorry, I forgot about the xcode project changes. I could have reverted
those as well.

pl

On 25 October 2016 at 22:49, Tim Hammerquist  wrote:
> Hi Pavel,
>
> Looks like some code left after this revert is still expecting this file
> (added contemporary to r284828) that was removed in this revision.
>
> --- lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
> (original)
> +++ lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
> (removed)
>
> This is causing the build to break. Does this require additional changes, or
> perhaps further reverts?
>
> -Tim
>
>
> On Tue, Oct 25, 2016 at 6:24 AM, Pavel Labath via lldb-commits
>  wrote:
>>
>> Author: labath
>> Date: Tue Oct 25 08:24:53 2016
>> New Revision: 285068
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=285068&view=rev
>> Log:
>> Revert "Improve the libstdc++ smart pointer formatters"
>>
>> This reverts commit r284828, as it causes an infinite loop in
>> TestPrintStackTraces (funnily enough, only when logging is enabled).
>>
>> Removed:
>> lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
>> Modified:
>>
>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>>
>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>> lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt
>> lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
>>
>> Modified:
>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>> URL:
>> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile?rev=285068&r1=285067&r2=285068&view=diff
>>
>> ==
>> ---
>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>> (original)
>> +++
>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>> Tue Oct 25 08:24:53 2016
>> @@ -2,7 +2,14 @@ LEVEL = ../../../../../make
>>
>>  CXX_SOURCES := main.cpp
>>
>> +CXXFLAGS := -O0
>>  USE_LIBSTDCPP := 1
>> -CFLAGS_EXTRAS += $(NO_LIMIT_DEBUG_INFO_FLAGS)
>> +
>> +# 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 += -fno-limit-debug-info
>> +endif
>>
>>  include $(LEVEL)/Makefile.rules
>>
>> Modified:
>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>> URL:
>> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py?rev=285068&r1=285067&r2=285068&view=diff
>>
>> ==
>> ---
>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>> (original)
>> +++
>> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>> Tue Oct 25 08:24:53 2016
>> @@ -31,58 +31,19 @@ class StdSmartPtrDataFormatterTestCase(T
>>  substrs=['stopped', 'stop reason = breakpoint'])
>>
>>  self.expect("frame variable nsp", substrs=['nsp = nullptr'])
>> -self.expect("frame variable isp", substrs=['isp = 123',
>> 'strong=1', 'weak=1'])
>> -self.expect("frame variable ssp", substrs=['ssp = "foobar"',
>> 'strong=1', 'weak=1'])
>> -self.expect("frame variable nwp", substrs=['nwp = nullptr'])
>> -self.expect("frame variable iwp", substrs=['iwp = 123',
>> 'strong=1', 'weak=1'])
>> -self.expect("frame variable swp", substrs=['swp = "foobar"',
>> 'strong=1', 'weak=1'])
>> -
>> -frame = self.frame()
>> -self.assertTrue(frame.IsValid())
>> -
>> -self.assertEqual(0,
>> frame.GetValueForVariablePath("nsp.pointer").GetValueAsUnsigned())
>> -self.assertEqual(0,
>> frame.GetValueForVariablePath("nwp.pointer").GetValueAsUnsigned())
>> -
>> -self.assertNotEqual(0,
>> frame.GetValueForVariablePath("isp.pointer").GetValueAsUnsigned())
>> -self.assertEqual(123,
>> frame.GetValueForVariablePath("isp.object").GetValueAsUnsigned())
>> -self.assertEqual(1,
>> frame.GetValueForVariablePath("isp.count").GetValueAsUnsigned())
>> -self.assertEqual(1,
>> frame.GetValueForVariablePath("isp.weak_count").GetValueAsUnsign

Re: [Lldb-commits] [lldb] r285068 - Revert "Improve the libstdc++ smart pointer formatters"

2016-10-25 Thread Jim Ingham via lldb-commits 
I already fixed this in r285113.

Jim

> On Oct 25, 2016, at 2:49 PM, Tim Hammerquist via lldb-commits 
>  wrote:
> 
> Hi Pavel,
> 
> Looks like some code left after this revert is still expecting this file 
> (added contemporary to r284828) that was removed in this revision.
> 
> --- lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp 
> (original)
> +++ lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp 
> (removed)
> 
> This is causing the build to break. Does this require additional changes, or 
> perhaps further reverts?
> 
> -Tim
> 
> 
> On Tue, Oct 25, 2016 at 6:24 AM, Pavel Labath via lldb-commits 
>  wrote:
> Author: labath
> Date: Tue Oct 25 08:24:53 2016
> New Revision: 285068
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=285068&view=rev
> Log:
> Revert "Improve the libstdc++ smart pointer formatters"
> 
> This reverts commit r284828, as it causes an infinite loop in
> TestPrintStackTraces (funnily enough, only when logging is enabled).
> 
> Removed:
> lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
> Modified:
> 
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
> 
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
> lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt
> lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
> 
> Modified: 
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
> URL: 
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile?rev=285068&r1=285067&r2=285068&view=diff
> ==
> --- 
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>  (original)
> +++ 
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
>  Tue Oct 25 08:24:53 2016
> @@ -2,7 +2,14 @@ LEVEL = ../../../../../make
> 
>  CXX_SOURCES := main.cpp
> 
> +CXXFLAGS := -O0
>  USE_LIBSTDCPP := 1
> -CFLAGS_EXTRAS += $(NO_LIMIT_DEBUG_INFO_FLAGS)
> +
> +# 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 += -fno-limit-debug-info
> +endif
> 
>  include $(LEVEL)/Makefile.rules
> 
> Modified: 
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
> URL: 
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py?rev=285068&r1=285067&r2=285068&view=diff
> ==
> --- 
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>  (original)
> +++ 
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
>  Tue Oct 25 08:24:53 2016
> @@ -31,58 +31,19 @@ class StdSmartPtrDataFormatterTestCase(T
>  substrs=['stopped', 'stop reason = breakpoint'])
> 
>  self.expect("frame variable nsp", substrs=['nsp = nullptr'])
> -self.expect("frame variable isp", substrs=['isp = 123', 'strong=1', 
> 'weak=1'])
> -self.expect("frame variable ssp", substrs=['ssp = "foobar"', 
> 'strong=1', 'weak=1'])
> -self.expect("frame variable nwp", substrs=['nwp = nullptr'])
> -self.expect("frame variable iwp", substrs=['iwp = 123', 'strong=1', 
> 'weak=1'])
> -self.expect("frame variable swp", substrs=['swp = "foobar"', 
> 'strong=1', 'weak=1'])
> -
> -frame = self.frame()
> -self.assertTrue(frame.IsValid())
> -
> -self.assertEqual(0, 
> frame.GetValueForVariablePath("nsp.pointer").GetValueAsUnsigned())
> -self.assertEqual(0, 
> frame.GetValueForVariablePath("nwp.pointer").GetValueAsUnsigned())
> -
> -self.assertNotEqual(0, 
> frame.GetValueForVariablePath("isp.pointer").GetValueAsUnsigned())
> -self.assertEqual(123, 
> frame.GetValueForVariablePath("isp.object").GetValueAsUnsigned())
> -self.assertEqual(1, 
> frame.GetValueForVariablePath("isp.count").GetValueAsUnsigned())
> -self.assertEqual(1, 
> frame.GetValueForVariablePath("isp.weak_count").GetValueAsUnsigned())
> -
> self.assertFalse(frame.GetValueForVariablePath("isp.fo

Re: [Lldb-commits] [lldb] r285068 - Revert "Improve the libstdc++ smart pointer formatters"

2016-10-25 Thread Tim Hammerquist via lldb-commits 
Hi Pavel,

Looks like some code left after this revert is still expecting this file
(added contemporary to r284828) that was removed in this revision.

--- lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
(original)
+++ lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
(removed)

This is causing the build to break. Does this require additional changes,
or perhaps further reverts?

-Tim


On Tue, Oct 25, 2016 at 6:24 AM, Pavel Labath via lldb-commits <
lldb-commits@lists.llvm.org> wrote:

> Author: labath
> Date: Tue Oct 25 08:24:53 2016
> New Revision: 285068
>
> URL: http://llvm.org/viewvc/llvm-project?rev=285068&view=rev
> Log:
> Revert "Improve the libstdc++ smart pointer formatters"
>
> This reverts commit r284828, as it causes an infinite loop in
> TestPrintStackTraces (funnily enough, only when logging is enabled).
>
> Removed:
> lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-
> formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-
> formatter/data-formatter-stl/libstdcpp/smart_ptr/
> TestDataFormatterStdSmartPtr.py
> lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt
> lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-
> formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/
> Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/
> libstdcpp/smart_ptr/Makefile?rev=285068&r1=285067&r2=285068&view=diff
> 
> ==
> --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-
> formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-
> formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile Tue Oct 25
> 08:24:53 2016
> @@ -2,7 +2,14 @@ LEVEL = ../../../../../make
>
>  CXX_SOURCES := main.cpp
>
> +CXXFLAGS := -O0
>  USE_LIBSTDCPP := 1
> -CFLAGS_EXTRAS += $(NO_LIMIT_DEBUG_INFO_FLAGS)
> +
> +# 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 += -fno-limit-debug-info
> +endif
>
>  include $(LEVEL)/Makefile.rules
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-
> formatter/data-formatter-stl/libstdcpp/smart_ptr/
> TestDataFormatterStdSmartPtr.py
> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/
> Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/
> libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.
> py?rev=285068&r1=285067&r2=285068&view=diff
> 
> ==
> --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-
> formatter/data-formatter-stl/libstdcpp/smart_ptr/
> TestDataFormatterStdSmartPtr.py (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-
> formatter/data-formatter-stl/libstdcpp/smart_ptr/
> TestDataFormatterStdSmartPtr.py Tue Oct 25 08:24:53 2016
> @@ -31,58 +31,19 @@ class StdSmartPtrDataFormatterTestCase(T
>  substrs=['stopped', 'stop reason = breakpoint'])
>
>  self.expect("frame variable nsp", substrs=['nsp = nullptr'])
> -self.expect("frame variable isp", substrs=['isp = 123',
> 'strong=1', 'weak=1'])
> -self.expect("frame variable ssp", substrs=['ssp = "foobar"',
> 'strong=1', 'weak=1'])
> -self.expect("frame variable nwp", substrs=['nwp = nullptr'])
> -self.expect("frame variable iwp", substrs=['iwp = 123',
> 'strong=1', 'weak=1'])
> -self.expect("frame variable swp", substrs=['swp = "foobar"',
> 'strong=1', 'weak=1'])
> -
> -frame = self.frame()
> -self.assertTrue(frame.IsValid())
> -
> -self.assertEqual(0, frame.GetValueForVariablePath("nsp.pointer").
> GetValueAsUnsigned())
> -self.assertEqual(0, frame.GetValueForVariablePath("nwp.pointer").
> GetValueAsUnsigned())
> -
> -self.assertNotEqual(0, frame.GetValueForVariablePath(
> "isp.pointer").GetValueAsUnsigned())
> -self.assertEqual(123, frame.GetValueForVariablePath(
> "isp.object").GetValueAsUnsigned())
> -self.assertEqual(1, frame.GetValueForVariablePath("isp.count").
> GetValueAsUnsigned())
> -self.assertEqual(1, frame.GetValueForVariablePath(
> "isp.weak_count").GetValueAsUnsigned())
> -self.assertFalse(frame.GetValueForVariablePath("isp.
> foobar").IsValid())
> +self.expect("frame variable isp", substrs=['isp = 123'])
> +self.expect("frame variabl

[Lldb-commits] [lldb] r285068 - Revert "Improve the libstdc++ smart pointer formatters"

2016-10-25 Thread Pavel Labath via lldb-commits 
Author: labath
Date: Tue Oct 25 08:24:53 2016
New Revision: 285068

URL: http://llvm.org/viewvc/llvm-project?rev=285068&view=rev
Log:
Revert "Improve the libstdc++ smart pointer formatters"

This reverts commit r284828, as it causes an infinite loop in
TestPrintStackTraces (funnily enough, only when logging is enabled).

Removed:
lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcppSmartPointer.cpp
Modified:

lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile

lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt
lldb/trunk/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp

Modified: 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile?rev=285068&r1=285067&r2=285068&view=diff
==
--- 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
 (original)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
 Tue Oct 25 08:24:53 2016
@@ -2,7 +2,14 @@ LEVEL = ../../../../../make
 
 CXX_SOURCES := main.cpp
 
+CXXFLAGS := -O0
 USE_LIBSTDCPP := 1
-CFLAGS_EXTRAS += $(NO_LIMIT_DEBUG_INFO_FLAGS)
+
+# 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 += -fno-limit-debug-info
+endif
 
 include $(LEVEL)/Makefile.rules

Modified: 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py?rev=285068&r1=285067&r2=285068&view=diff
==
--- 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
 (original)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
 Tue Oct 25 08:24:53 2016
@@ -31,58 +31,19 @@ class StdSmartPtrDataFormatterTestCase(T
 substrs=['stopped', 'stop reason = breakpoint'])
 
 self.expect("frame variable nsp", substrs=['nsp = nullptr'])
-self.expect("frame variable isp", substrs=['isp = 123', 'strong=1', 
'weak=1'])
-self.expect("frame variable ssp", substrs=['ssp = "foobar"', 
'strong=1', 'weak=1'])
-self.expect("frame variable nwp", substrs=['nwp = nullptr'])
-self.expect("frame variable iwp", substrs=['iwp = 123', 'strong=1', 
'weak=1'])
-self.expect("frame variable swp", substrs=['swp = "foobar"', 
'strong=1', 'weak=1'])
-
-frame = self.frame()
-self.assertTrue(frame.IsValid())
-
-self.assertEqual(0, 
frame.GetValueForVariablePath("nsp.pointer").GetValueAsUnsigned())
-self.assertEqual(0, 
frame.GetValueForVariablePath("nwp.pointer").GetValueAsUnsigned())
-
-self.assertNotEqual(0, 
frame.GetValueForVariablePath("isp.pointer").GetValueAsUnsigned())
-self.assertEqual(123, 
frame.GetValueForVariablePath("isp.object").GetValueAsUnsigned())
-self.assertEqual(1, 
frame.GetValueForVariablePath("isp.count").GetValueAsUnsigned())
-self.assertEqual(1, 
frame.GetValueForVariablePath("isp.weak_count").GetValueAsUnsigned())
-self.assertFalse(frame.GetValueForVariablePath("isp.foobar").IsValid())
+self.expect("frame variable isp", substrs=['isp = 123'])
+self.expect("frame variable ssp", substrs=['ssp = "foobar"'])
 
-self.assertNotEqual(0, 
frame.GetValueForVariablePath("ssp.pointer").GetValueAsUnsigned())
-self.assertEqual('"foobar"', 
frame.GetValueForVariablePath("ssp.object").GetSummary())
-self.assertEqual(1, 
frame.GetValueForVariablePath("ssp.count").GetValueAsUnsigned())
-self.assertEqual(1, 
frame.GetValueForVariablePath("ssp.weak_count").GetValueAsUnsigned())
-self.assertFalse(frame.GetValueForVariablePath("ssp.foobar").IsValid())
-
-self.assertNotEqual(0, 
frame.GetValueForVariablePath("iwp.pointer").GetValueAsUnsigned())
-self.assertEqual(123, 
frame.GetValueForVariablePath("iwp.object").GetValueAsUnsigned()