[Lldb-commits] [lldb] b852225 - [lldb] Enable std::pair in CxxModuleHandler

[Raphael Isemann via lldb-commits]

Author: Raphael Isemann
Date: 2020-09-09T10:49:53+02:00
New Revision: b85222520f861a1812f991d6bd65950dda22f31b

URL: https://github.com/llvm/llvm-project/commit/b85222520f861a1812f991d6bd65950dda22f31b
DIFF: https://github.com/llvm/llvm-project/commit/b85222520f861a1812f991d6bd65950dda22f31b.diff

LOG: [lldb] Enable std::pair in CxxModuleHandler

This adds support for substituting std::pair instantiations with enabled
import-std-module.

With the fixes in parent revisions we can currently substitute a single pair
(however, a result that returns a second pair currently causes LLDB to crash
while importing the second template instantiation).

Reviewed By: aprantl

Differential Revision: https://reviews.llvm.org/D85141

Added: 
    lldb/test/API/commands/expression/import-std-module/pair/Makefile
    lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/pair/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 2f8cf1846ee7..38d9f8d1e4b8 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp
@@ -34,6 +34,7 @@ CxxModuleHandler::CxxModuleHandler(ASTImporter &importer, ASTContext *target)
       "weak_ptr",
       // utility
       "allocator",
+      "pair",
   };
   m_supported_templates.insert(supported_names.begin(), supported_names.end());
 }

diff  --git a/lldb/test/API/commands/expression/import-std-module/pair/Makefile b/lldb/test/API/commands/expression/import-std-module/pair/Makefile
new file mode 100644
index 000000000000..f938f7428468
--- /dev/null
+++ b/lldb/test/API/commands/expression/import-std-module/pair/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/pair/TestPairFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
new file mode 100644
index 000000000000..4f5b1ea8028b
--- /dev/null
+++ b/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
@@ -0,0 +1,25 @@
+"""
+Test basic std::pair 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")
+
+        self.expect_expr("pair_int.first", result_type="int", result_value="1234")
+        self.expect_expr("pair_int.second", result_type="int", result_value="5678")
+        self.expect("expr pair_int", substrs=['first = 1234, second = 5678'])
\ No newline at end of file

diff  --git a/lldb/test/API/commands/expression/import-std-module/pair/main.cpp b/lldb/test/API/commands/expression/import-std-module/pair/main.cpp
new file mode 100644
index 000000000000..1363698f1fc7
--- /dev/null
+++ b/lldb/test/API/commands/expression/import-std-module/pair/main.cpp
@@ -0,0 +1,6 @@
+#include <utility>
+
+int main(int argc, char **argv) {
+  std::pair<int, int> pair_int(1234, 5678);
+  return 0; // Set break point at this line.
+}