[Lldb-commits] [lldb] r220070 - Fixed the expression parser to handle cases where

[Sean Callanan]

Author: spyffe
Date: Fri Oct 17 13:16:04 2014
New Revision: 220070

URL: http://llvm.org/viewvc/llvm-project?rev=220070&view=rev
Log:
Fixed the expression parser to handle cases where
GetValueForVariableExpressionPath returns NULL and
doesn't set an error.

<rdar://problem/18682916>

Modified:
    lldb/trunk/source/Expression/ClangUserExpression.cpp
    lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py

Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUserExpression.cpp?rev=220070&r1=220069&r2=220070&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUserExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangUserExpression.cpp Fri Oct 17 13:16:04 2014
@@ -627,7 +627,7 @@ GetObjectPointer (lldb::StackFrameSP fra
                                                             var_sp,
                                                             err);
 
-    if (!err.Success())
+    if (!err.Success() || !valobj_sp.get())
         return LLDB_INVALID_ADDRESS;
 
     lldb::addr_t ret = valobj_sp->GetValueAsUnsigned(LLDB_INVALID_ADDRESS);

Modified: lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py?rev=220070&r1=220069&r2=220070&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py (original)
+++ lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py Fri Oct 17 13:16:04 2014
@@ -15,7 +15,6 @@ class TestObjCIvarsInBlocks(TestBase):
     @expectedFailurei386
     @python_api_test
     @dsym_test
-    @unittest2.skip("rdar://18682916")
     def test_with_dsym_and_python_api(self):
         """Test printing the ivars of the self when captured in blocks"""
         self.buildDsym()
@@ -26,7 +25,6 @@ class TestObjCIvarsInBlocks(TestBase):
     # This test requires the 2.0 runtime, so it will fail on i386.
     @expectedFailurei386
     @dwarf_test
-    @unittest2.skip("rdar://18682916")
     def test_with_dwarf_and_python_api(self):
         """Test printing the ivars of the self when captured in blocks"""
         self.buildDwarf()