danilashtefan updated this revision to Diff 382325.
danilashtefan added a comment.
Minor corrections
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D112180/new/
https://reviews.llvm.org/D112180
Files:
lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/Makefile
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/main.cpp
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/main.cpp
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/main.cpp
@@ -0,0 +1,55 @@
+#include <set>
+#include <string>
+
+int g_the_foo = 0;
+
+int thefoo_rw(int arg = 1) {
+ if (arg < 0)
+ arg = 0;
+ if (!arg)
+ arg = 1;
+ g_the_foo += arg;
+ return g_the_foo;
+}
+
+void by_ref_and_ptr(std::set<int> &ref, std::set<int> *ptr) {
+ // Stop here to check by ref and ptr
+ return;
+}
+
+int main() {
+ std::set<int> ii;
+ thefoo_rw(1); // Set break point at this line.
+
+ ii.insert(0);
+ ii.insert(1);
+ ii.insert(2);
+ ii.insert(3);
+ ii.insert(4);
+ ii.insert(5);
+ thefoo_rw(1); // Set break point at this line.
+
+ ii.insert(6);
+ thefoo_rw(1); // Set break point at this line.
+
+ by_ref_and_ptr(ii, &ii);
+
+ ii.clear();
+ thefoo_rw(1); // Set break point at this line.
+
+ std::set<std::string> ss;
+ thefoo_rw(1); // Set break point at this line.
+
+ ss.insert("a");
+ ss.insert("a very long string is right here");
+ thefoo_rw(1); // Set break point at this line.
+
+ ss.insert("b");
+ ss.insert("c");
+ thefoo_rw(1); // Set break point at this line.
+
+ ss.erase("b");
+ thefoo_rw(1); // Set break point at this line.
+
+ return 0;
+}
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
@@ -0,0 +1,157 @@
+"""
+Test lldb data formatter subsystem.
+"""
+
+
+
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+USE_LIBSTDCPP = "USE_LIBSTDCPP"
+USE_LIBCPP = "USE_LIBCPP"
+
+class LibcxxSetDataFormatterTestCase(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ def setUp(self):
+ TestBase.setUp(self)
+ self.namespace = 'std'
+
+ def getVariableType(self, name):
+ var = self.frame().FindVariable(name)
+ self.assertTrue(var.IsValid())
+ return var.GetType().GetDisplayTypeName()
+
+ def check_ii(self, var_name):
+ """ This checks the value of the bitset stored in ii at the call to by_ref_and_ptr.
+ We use this to make sure we get the same values for ii when we look at the object
+ directly, and when we look at a reference to the object. """
+ self.expect(
+ "frame variable " + var_name,
+ substrs=["size=7",
+ "[2] = 2",
+ "[3] = 3",
+ "[6] = 6"])
+ self.expect("frame variable " + var_name + "[2]", substrs=[" = 2"])
+ self.expect(
+ "p " + var_name,
+ substrs=[
+ "size=7",
+ "[2] = 2",
+ "[3] = 3",
+ "[6] = 6"])
+
+
+ def do_test_with_run_command(self,stdlib_type):
+ """Test that that file and class static variables display correctly."""
+ self.build(dictionary={stdlib_type: "1"})
+ (self.target, process, _, bkpt) = lldbutil.run_to_source_breakpoint(
+ self, "Set break point at this line.", lldb.SBFileSpec("main.cpp", False))
+
+ # This is the function to remove the custom formats in order to have a
+ # clean slate for the next test case.
+ def cleanup():
+ self.runCmd('type format clear', check=False)
+ self.runCmd('type summary clear', check=False)
+ self.runCmd('type filter clear', check=False)
+ self.runCmd('type synth clear', check=False)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
+
+ # Execute the cleanup function during test case tear down.
+ self.addTearDownHook(cleanup)
+
+ ii_type = self.getVariableType("ii")
+ self.assertTrue(ii_type.startswith(self.namespace + "::set"),
+ "Type: " + ii_type)
+
+ self.expect("frame variable ii", substrs=["size=0", "{}"])
+ lldbutil.continue_to_breakpoint(process, bkpt)
+ self.expect(
+ "frame variable ii",
+ substrs=["size=6",
+ "[0] = 0",
+ "[1] = 1",
+ "[2] = 2",
+ "[3] = 3",
+ "[4] = 4",
+ "[5] = 5"])
+ lldbutil.continue_to_breakpoint(process, bkpt)
+ self.check_ii("ii")
+
+ lldbutil.continue_to_breakpoint(process, bkpt)
+ self.expect("frame variable ii", substrs=["size=0", "{}"])
+ lldbutil.continue_to_breakpoint(process, bkpt)
+ self.expect("frame variable ii", substrs=["size=0", "{}"])
+
+ ss_type = self.getVariableType("ss")
+ self.assertTrue(ii_type.startswith(self.namespace + "::set"),
+ "Type: " + ss_type)
+
+ self.expect("frame variable ss", substrs=["size=0", "{}"])
+ lldbutil.continue_to_breakpoint(process, bkpt)
+ self.expect(
+ "frame variable ss",
+ substrs=["size=2",
+ '[0] = "a"',
+ '[1] = "a very long string is right here"'])
+ lldbutil.continue_to_breakpoint(process, bkpt)
+ self.expect(
+ "frame variable ss",
+ substrs=["size=4",
+ '[0] = "a"',
+ '[1] = "a very long string is right here"',
+ '[2] = "b"',
+ '[3] = "c"'])
+ self.expect(
+ "p ss",
+ substrs=["size=4",
+ '[0] = "a"',
+ '[1] = "a very long string is right here"',
+ '[2] = "b"',
+ '[3] = "c"'])
+ self.expect("frame variable ss[2]", substrs=[' = "b"'])
+ lldbutil.continue_to_breakpoint(process, bkpt)
+ self.expect(
+ "frame variable ss",
+ substrs=["size=3",
+ '[0] = "a"',
+ '[1] = "a very long string is right here"',
+ '[2] = "c"'])
+
+ @add_test_categories(["libstdcxx"])
+ def test_with_run_command_libstdcpp(self):
+ self.do_test_with_run_command(USE_LIBSTDCPP)
+
+ @add_test_categories(["libc++"])
+ def test_with_run_command_libcpp(self):
+ self.do_test_with_run_command(USE_LIBCPP)
+
+
+ def do_test_ref_and_ptr(self,stdlib_type):
+ """Test that the data formatters work on ref and ptr."""
+ self.build()
+ (self.target, process, _, bkpt) = lldbutil.run_to_source_breakpoint(
+ self, "Stop here to check by ref and ptr.",
+ lldb.SBFileSpec("main.cpp", False))
+ # The reference should print just like the value:
+ self.check_ii("ref")
+
+ self.expect("frame variable ptr",
+ substrs=["ptr =", "size=7"])
+ self.expect("expr ptr",
+ substrs=["size=7"])
+
+ @add_test_categories(["libstdcxx"])
+ def test_ref_and_ptr_libstdcpp(self):
+ self.do_test_ref_and_ptr(USE_LIBSTDCPP)
+
+ @add_test_categories(["libc++"])
+ def test_ref_and_ptr_libcpp(self):
+ self.do_test_ref_and_ptr(USE_LIBCPP)
+
+
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/Makefile
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/Makefile
@@ -0,0 +1,5 @@
+CXX_SOURCES := main.cpp
+
+
+
+include Makefile.rules
Index: lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
@@ -905,6 +905,8 @@
SyntheticChildren::Flags stl_synth_flags;
stl_synth_flags.SetCascades(true).SetSkipPointers(false).SetSkipReferences(
false);
+ SyntheticChildren::Flags stl_deref_flags = stl_synth_flags;
+ stl_deref_flags.SetFrontEndWantsDereference();
cpp_category_sp->GetRegexTypeSyntheticsContainer()->Add(
RegularExpression("^std::vector<.+>(( )?&)?$"),
@@ -916,6 +918,11 @@
SyntheticChildrenSP(new ScriptedSyntheticChildren(
stl_synth_flags,
"lldb.formatters.cpp.gnu_libstdcpp.StdMapSynthProvider")));
+ cpp_category_sp->GetRegexTypeSyntheticsContainer()->Add(
+ RegularExpression("^std::set<.+> >(( )?&)?$"),
+ SyntheticChildrenSP(new ScriptedSyntheticChildren(
+ stl_synth_flags,
+ "lldb.formatters.cpp.gnu_libstdcpp.StdMapSynthProvider")));
cpp_category_sp->GetRegexTypeSyntheticsContainer()->Add(
RegularExpression("^std::(__cxx11::)?list<.+>(( )?&)?$"),
SyntheticChildrenSP(new ScriptedSyntheticChildren(
@@ -931,6 +938,12 @@
RegularExpression("^std::map<.+> >(( )?&)?$"),
TypeSummaryImplSP(
new StringSummaryFormat(stl_summary_flags, "size=${svar%#}")));
+ TypeSummaryImpl::Flags stl_set_summary_flags = stl_summary_flags;
+ stl_set_summary_flags.SetSkipPointers(false).SetDontShowValue(false);
+ cpp_category_sp->GetRegexTypeSummariesContainer()->Add(
+ RegularExpression("^std::set<.+> >(( )?&)?$"),
+ TypeSummaryImplSP(
+ new StringSummaryFormat(stl_set_summary_flags, "size=${svar%#}")));
cpp_category_sp->GetRegexTypeSummariesContainer()->Add(
RegularExpression("^std::(__cxx11::)?list<.+>(( )?&)?$"),
TypeSummaryImplSP(
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
