Author: tberghammer
Date: Sat Jan 7 10:39:07 2017
New Revision: 291350
URL: http://llvm.org/viewvc/llvm-project?rev=291350&view=rev
Log:
Fix dereferencing of pointers to empty classes
Added:
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/TestValueAPIEmptyClass.py
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/main.cpp
Modified:
lldb/trunk/source/Symbol/ClangASTContext.cpp
Added:
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile?rev=291350&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile
Sat Jan 7 10:39:07 2017
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
Added:
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/TestValueAPIEmptyClass.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/TestValueAPIEmptyClass.py?rev=291350&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/TestValueAPIEmptyClass.py
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/TestValueAPIEmptyClass.py
Sat Jan 7 10:39:07 2017
@@ -0,0 +1,60 @@
+from __future__ import print_function
+
+import os
+import time
+import re
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class ValueAPIEmptyClassTestCase(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ @add_test_categories(['pyapi'])
+ def test(self):
+ self.build()
+ exe = os.path.join(os.getcwd(), 'a.out')
+ line = line_number('main.cpp', '// Break at this line')
+
+ # Create a target by the debugger.
+ target = self.dbg.CreateTarget(exe)
+ self.assertTrue(target, VALID_TARGET)
+
+ # Create the breakpoint inside function 'main'.
+ breakpoint = target.BreakpointCreateByLocation('main.cpp', line)
+ self.assertTrue(breakpoint, VALID_BREAKPOINT)
+
+ # Now launch the process, and do not stop at entry point.
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
+ self.assertTrue(process, PROCESS_IS_VALID)
+
+ # Get Frame #0.
+ self.assertTrue(process.GetState() == lldb.eStateStopped)
+ thread = lldbutil.get_stopped_thread(
+ process, lldb.eStopReasonBreakpoint)
+ self.assertTrue(
+ thread.IsValid(),
+ "There should be a thread stopped due to breakpoint condition")
+ frame0 = thread.GetFrameAtIndex(0)
+
+ # Verify that we can access to a frame variable with an empty class
type
+ e = frame0.FindVariable('e')
+ self.assertTrue(e.IsValid(), VALID_VARIABLE)
+ self.DebugSBValue(e)
+ self.assertEqual(e.GetNumChildren(), 0)
+
+ # Verify that we can acces to a frame variable what is a pointer to an
+ # empty class
+ ep = frame0.FindVariable('ep')
+ self.assertTrue(ep.IsValid(), VALID_VARIABLE)
+ self.DebugSBValue(ep)
+
+ # Verify that we can dereference a pointer to an empty class
+ epd = ep.Dereference()
+ self.assertTrue(epd.IsValid(), VALID_VARIABLE)
+ self.DebugSBValue(epd)
+ self.assertEqual(epd.GetNumChildren(), 0)
+
Added:
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/main.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/main.cpp?rev=291350&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/main.cpp
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/main.cpp
Sat Jan 7 10:39:07 2017
@@ -0,0 +1,16 @@
+//===-- main.cpp ------------------------------------------------*- C++
-*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+class Empty {};
+
+int main (int argc, char const *argv[]) {
+ Empty e;
+ Empty* ep = new Empty;
+ return 0; // Break at this line
+}
Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=291350&r1=291349&r2=291350&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Sat Jan 7 10:39:07 2017
@@ -6752,43 +6752,42 @@ CompilerType ClangASTContext::GetChildCo
}
break;
- case clang::Type::Pointer:
- if (idx_is_valid) {
- CompilerType pointee_clang_type(GetPointeeType(type));
-
- // Don't dereference "void *" pointers
- if (pointee_clang_type.IsVoidType())
- return CompilerType();
-
- if (transparent_pointers && pointee_clang_type.IsAggregateType()) {
- child_is_deref_of_parent = false;
- bool tmp_child_is_deref_of_parent = false;
- return pointee_clang_type.GetChildCompilerTypeAtIndex(
- exe_ctx, idx, transparent_pointers, omit_empty_base_classes,
- ignore_array_bounds, child_name, child_byte_size,
child_byte_offset,
- child_bitfield_bit_size, child_bitfield_bit_offset,
- child_is_base_class, tmp_child_is_deref_of_parent, valobj,
- language_flags);
- } else {
- child_is_deref_of_parent = true;
-
- const char *parent_name =
- valobj ? valobj->GetName().GetCString() : NULL;
- if (parent_name) {
- child_name.assign(1, '*');
- child_name += parent_name;
- }
-
- // We have a pointer to an simple type
- if (idx == 0) {
- child_byte_size = pointee_clang_type.GetByteSize(
- exe_ctx ? exe_ctx->GetBestExecutionContextScope() : NULL);
- child_byte_offset = 0;
- return pointee_clang_type;
- }
+ case clang::Type::Pointer: {
+ CompilerType pointee_clang_type(GetPointeeType(type));
+
+ // Don't dereference "void *" pointers
+ if (pointee_clang_type.IsVoidType())
+ return CompilerType();
+
+ if (transparent_pointers && pointee_clang_type.IsAggregateType()) {
+ child_is_deref_of_parent = false;
+ bool tmp_child_is_deref_of_parent = false;
+ return pointee_clang_type.GetChildCompilerTypeAtIndex(
+ exe_ctx, idx, transparent_pointers, omit_empty_base_classes,
+ ignore_array_bounds, child_name, child_byte_size, child_byte_offset,
+ child_bitfield_bit_size, child_bitfield_bit_offset,
+ child_is_base_class, tmp_child_is_deref_of_parent, valobj,
+ language_flags);
+ } else {
+ child_is_deref_of_parent = true;
+
+ const char *parent_name =
+ valobj ? valobj->GetName().GetCString() : NULL;
+ if (parent_name) {
+ child_name.assign(1, '*');
+ child_name += parent_name;
+ }
+
+ // We have a pointer to an simple type
+ if (idx == 0) {
+ child_byte_size = pointee_clang_type.GetByteSize(
+ exe_ctx ? exe_ctx->GetBestExecutionContextScope() : NULL);
+ child_byte_offset = 0;
+ return pointee_clang_type;
}
}
break;
+ }
case clang::Type::LValueReference:
case clang::Type::RValueReference:
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
