diff options
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/source/Expression/ClangUserExpression.cpp | 2 | ||||
| -rw-r--r-- | lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp index a15d1a67e0c..5de6862aa14 100644 --- a/lldb/source/Expression/ClangUserExpression.cpp +++ b/lldb/source/Expression/ClangUserExpression.cpp @@ -627,7 +627,7 @@ GetObjectPointer (lldb::StackFrameSP frame_sp, 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); diff --git a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py index 96f08a70a76..dfb6431d79c 100644 --- a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py +++ b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py @@ -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() |
