Author: Raphael Isemann Date: 2020-12-17T11:47:58+01:00 New Revision: b8338983e6f6ec6ebd48a7fc640b5d859e653b27
URL: https://github.com/llvm/llvm-project/commit/b8338983e6f6ec6ebd48a7fc640b5d859e653b27 DIFF: https://github.com/llvm/llvm-project/commit/b8338983e6f6ec6ebd48a7fc640b5d859e653b27.diff LOG: [lldb] Add std::array to the supported template list of the CxxModuleHandler Identical to the other patches that add STL containers to the supported templated list. Added: lldb/test/API/commands/expression/import-std-module/array/Makefile lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py lldb/test/API/commands/expression/import-std-module/array/main.cpp Modified: lldb/source/Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp b/lldb/source/Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp index 8a8450245990..f953e860969c 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp @@ -22,6 +22,7 @@ CxxModuleHandler::CxxModuleHandler(ASTImporter &importer, ASTContext *target) std::initializer_list<const char *> supported_names = { // containers + "array", "deque", "forward_list", "list", diff --git a/lldb/test/API/commands/expression/import-std-module/array/Makefile b/lldb/test/API/commands/expression/import-std-module/array/Makefile new file mode 100644 index 000000000000..f938f7428468 --- /dev/null +++ b/lldb/test/API/commands/expression/import-std-module/array/Makefile @@ -0,0 +1,3 @@ +USE_LIBCPP := 1 +CXX_SOURCES := main.cpp +include Makefile.rules diff --git a/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py new file mode 100644 index 000000000000..ba9a7853b2f6 --- /dev/null +++ b/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py @@ -0,0 +1,86 @@ +""" +Test basic std::array functionality. +""" + +from lldbsuite.test.decorators import * +from lldbsuite.test.lldbtest import * +from lldbsuite.test import lldbutil + + +class TestCase(TestBase): + + mydir = TestBase.compute_mydir(__file__) + + @add_test_categories(["libc++"]) + @skipIf(compiler=no_match("clang")) + def test(self): + self.build() + + lldbutil.run_to_source_breakpoint(self, + "// Set break point at this line.", + lldb.SBFileSpec("main.cpp")) + + self.runCmd("settings set target.import-std-module true") + + + # Test inspecting an array of integers. + array_type = "std::array<int, 3>" + size_type = "std::array::size_type" + value_type = array_type + "::value_type" + + iterator = array_type + "::iterator" + riterator = array_type + "::reverse_iterator" + + self.expect_expr("a", + result_type=array_type, + result_children=[ + ValueCheck(name="__elems_", children=[ + ValueCheck(value="3"), + ValueCheck(value="1"), + ValueCheck(value="2"), + ]) + ]) + self.expect_expr("a.size()", result_type=size_type, result_value="3") + self.expect_expr("a.front()", result_type=value_type, result_value="3") + self.expect_expr("a[1]", result_type=value_type, result_value="1") + self.expect_expr("a.back()", result_type=value_type, result_value="2") + + # Both are just pointers to the underlying elements. + self.expect_expr("a.begin()", result_type=iterator) + self.expect_expr("a.rbegin()", result_type=riterator) + + self.expect_expr("*a.begin()", result_type=value_type, result_value="3") + self.expect_expr("*a.rbegin()", result_type="int", result_value="2") + + self.expect_expr("a.at(0)", result_type=value_type, result_value="3") + + + # Same again with an array that has an element type from debug info. + array_type = "std::array<DbgInfo, 1>" + size_type = "std::array::size_type" + value_type = array_type + "::value_type" + + iterator = array_type + "::iterator" + riterator = array_type + "::reverse_iterator" + dbg_info_elem_children = [ValueCheck(value="4")] + dbg_info_elem = [ValueCheck(children=dbg_info_elem_children)] + + self.expect_expr("b", + result_type=array_type, + result_children=[ + ValueCheck(name="__elems_", children=dbg_info_elem) + ]) + self.expect_expr("b.size()", result_type=size_type, result_value="1") + self.expect_expr("b.front()", result_type=value_type, result_children=dbg_info_elem_children) + self.expect_expr("b[0]", result_type=value_type, result_children=dbg_info_elem_children) + self.expect_expr("b.back()", result_type=value_type, result_children=dbg_info_elem_children) + + # Both are just pointers to the underlying elements. + self.expect_expr("b.begin()", result_type=iterator) + self.expect_expr("b.rbegin()", result_type=riterator) + + self.expect_expr("*b.begin()", result_type=value_type, result_children=dbg_info_elem_children) + self.expect_expr("*b.rbegin()", result_type="DbgInfo", result_children=dbg_info_elem_children) + + self.expect_expr("b.at(0)", result_type=value_type, result_children=dbg_info_elem_children) + diff --git a/lldb/test/API/commands/expression/import-std-module/array/main.cpp b/lldb/test/API/commands/expression/import-std-module/array/main.cpp new file mode 100644 index 000000000000..9bcd0b574042 --- /dev/null +++ b/lldb/test/API/commands/expression/import-std-module/array/main.cpp @@ -0,0 +1,11 @@ +#include <array> + +struct DbgInfo { + int v = 4; +}; + +int main(int argc, char **argv) { + std::array<int, 3> a = {3, 1, 2}; + std::array<DbgInfo, 1> b{DbgInfo()}; + return 0; // Set break point at this line. +} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
