jarin created this revision.
Herald added subscribers: lldb-commits, JDevlieghere, teemperor.
Herald added a project: LLDB.
This makes sure that we associate DIEs that are imported from other CUs with
the appropriate decl context.
Without this fix, nested classes can be dumped directly into their CU context
if their parent was imported from another CU.
Repository:
rLLDB LLDB
https://reviews.llvm.org/D68278
Files:
packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/Makefile
packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/main.cpp
packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/other.cpp
packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/shared.h
source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
Index: source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
===================================================================
--- source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+++ source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
@@ -690,6 +690,8 @@
type_sp = unique_ast_entry_up->m_type_sp;
if (type_sp) {
dwarf->GetDIEToType()[die.GetDIE()] = type_sp.get();
+ LinkDeclContextToDIE(
+ GetCachedClangDeclContextForDIE(unique_ast_entry_up->m_die), die);
return type_sp;
}
}
Index: packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/shared.h
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/shared.h
@@ -0,0 +1,17 @@
+struct OuterX {
+ template<typename T>
+ struct Inner {
+ int oX_inner = 42;
+ };
+};
+
+struct OuterY {
+ template<typename T>
+ struct Inner {
+ typename OuterX::Inner<T> oY_inner;
+ };
+};
+
+struct WrapperB;
+
+WrapperB* foo();
Index: packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/other.cpp
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/other.cpp
@@ -0,0 +1,10 @@
+#include "shared.h"
+
+struct WrapperB {
+ OuterY y;
+ OuterX x;
+};
+
+WrapperB* foo() {
+ return new WrapperB();
+}
Index: packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/main.cpp
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/main.cpp
@@ -0,0 +1,11 @@
+#include "shared.h"
+
+struct WrapperA {
+ OuterY::Inner<unsigned int> y;
+};
+
+int main() {
+ WrapperA a;
+ WrapperB* b = foo();
+ return 0; // break here
+}
Index: packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
@@ -0,0 +1,22 @@
+"""
+Test that we can call C++ template fucntions.
+"""
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class TestNestedClassWithParentInAnotherCU(TestBase):
+ mydir = TestBase.compute_mydir(__file__)
+
+ def test_nested_class_with_parent_in_another_cu(self):
+ self.main_source_file = lldb.SBFileSpec("main.cpp")
+ self.build()
+ (_, _, thread, _) = lldbutil.run_to_source_breakpoint(self, "// break here", self.main_source_file)
+ frame = thread.GetSelectedFrame()
+ warmup_result = frame.EvaluateExpression("b")
+ self.assertTrue(warmup_result.IsValid())
+ expr_result = frame.EvaluateExpression("a.y.oY_inner.oX_inner")
+ self.assertTrue(expr_result.IsValid())
+ self.assertEqual(expr_result.GetValue(), "42")
Index: packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/Makefile
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp other.cpp
+
+include $(LEVEL)/Makefile.rules
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
