https://github.com/Michael137 created
https://github.com/llvm/llvm-project/pull/124101
Reverts llvm/llvm-project#123393
This is causing `TestVectorOfVectorsFromStdModule.py` to fail on the the macOS
clang-15 matrix bot.
>From bb21661782242f931f3d04eb8fed9be792bd4ef8 Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuc...@gmail.com>
Date: Thu, 23 Jan 2025 11:27:19 +0000
Subject: [PATCH] Revert "[lldb][test] Remove compiler version check and use
regex (#123393)"
This reverts commit b62e55803c52ca04093a0eea361407e849dc23e1.
---
.../TestDbgInfoContentVectorFromStdModule.py | 22 +++++----
.../TestVectorOfVectorsFromStdModule.py | 46 +++++++++++++------
2 files changed, 45 insertions(+), 23 deletions(-)
diff --git
a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
index 759077302bfca4..1c32222e64f14c 100644
---
a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
+++
b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
@@ -23,6 +23,13 @@ def test(self):
self.runCmd("settings set target.import-std-module true")
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(
+ [">", "16.0"]
+ ):
+ vector_type = "std::vector<Foo>"
+ else:
+ vector_type = "std::vector<Foo, std::allocator<Foo> >"
+
size_type = "size_type"
value_type = "value_type"
iterator = "iterator"
@@ -34,14 +41,13 @@ def test(self):
ValueCheck(name="current"),
]
- self.expect(
- "expr a",
- patterns=[
- """\(std::vector<Foo(, std::allocator<Foo> )*>\) \$0 = size=3
\{
- \[0\] = \(a = 3\)
- \[1\] = \(a = 1\)
- \[2\] = \(a = 2\)
-\}"""
+ self.expect_expr(
+ "a",
+ result_type=vector_type,
+ result_children=[
+ ValueCheck(children=[ValueCheck(value="3")]),
+ ValueCheck(children=[ValueCheck(value="1")]),
+ ValueCheck(children=[ValueCheck(value="2")]),
],
)
diff --git
a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
index e18785ec1359cc..a1f33271f39d2f 100644
---
a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
+++
b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
@@ -17,26 +17,42 @@ def test(self):
self, "// Set break point at this line.",
lldb.SBFileSpec("main.cpp")
)
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(
+ [">", "16.0"]
+ ):
+ vector_type = "std::vector<int>"
+ vector_of_vector_type = "std::vector<std::vector<int> >"
+ else:
+ vector_type = "std::vector<int>"
+ vector_of_vector_type = (
+ "std::vector<std::vector<int>, std::allocator<std::vector<int>
> >"
+ )
+
size_type = "size_type"
value_type = "value_type"
self.runCmd("settings set target.import-std-module true")
- self.expect(
- "expr a",
- patterns=[
- """\(std::vector<std::vector<int>(,
std::allocator<std::vector<int> )* >\) \$0 = size=2 \{
- \[0\] = size=3 \{
- \[0\] = 1
- \[1\] = 2
- \[2\] = 3
- \}
- \[1\] = size=3 \{
- \[0\] = 3
- \[1\] = 2
- \[2\] = 1
- \}
-\}"""
+ self.expect_expr(
+ "a",
+ result_type=vector_of_vector_type,
+ result_children=[
+ ValueCheck(
+ type=vector_type,
+ children=[
+ ValueCheck(value="1"),
+ ValueCheck(value="2"),
+ ValueCheck(value="3"),
+ ],
+ ),
+ ValueCheck(
+ type=vector_type,
+ children=[
+ ValueCheck(value="3"),
+ ValueCheck(value="2"),
+ ValueCheck(value="1"),
+ ],
+ ),
],
)
self.expect_expr("a.size()", result_type=size_type, result_value="2")
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
