Skip to content

Commit 68a1593

Browse files
committed
[lldb] Support non-default libc++ ABI namespace
This is a fix forward for the issue introduced in #104523.
1 parent 92e00af commit 68a1593

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class LibCXXFrameRecognizer : public StackFrameRecognizer {
5454
public:
5555
LibCXXFrameRecognizer()
5656
: m_hidden_function_regex(
57-
R"(^std::__1::(__function.*::operator\(\)|__invoke))"
57+
R"(^std::__.*::(__function.*::operator\(\)|__invoke))"
5858
R"((\[.*\])?)" // ABI tag.
5959
R"(( const)?$)"), // const.
6060
m_hidden_frame(new LibCXXHiddenFrame()) {}
@@ -81,7 +81,7 @@ CPPLanguageRuntime::CPPLanguageRuntime(Process *process)
8181
if (process)
8282
process->GetTarget().GetFrameRecognizerManager().AddRecognizer(
8383
StackFrameRecognizerSP(new LibCXXFrameRecognizer()), {},
84-
std::make_shared<RegularExpression>("^std::__1::"),
84+
std::make_shared<RegularExpression>("^std::__.*::"),
8585
/*first_instruction_only*/ false);
8686
}
8787

lldb/test/API/lang/cpp/std-function-recognizer/TestStdFunctionRecognizer.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ def test_backtrace(self):
2121
substrs=["frame", "foo", "frame", "main"],
2222
)
2323
self.expect(
24-
"thread backtrace", matching=False, patterns=["frame.*std::__1::__function"]
24+
"thread backtrace", matching=False, patterns=["frame.*std::__.*::__function"]
2525
)
2626
# Unfiltered.
2727
self.expect(
2828
"thread backtrace -u",
2929
ordered=True,
30-
patterns=["frame.*foo", "frame.*std::__1::__function", "frame.*main"],
30+
patterns=["frame.*foo", "frame.*std::__.*::__function", "frame.*main"],
3131
)
3232
self.expect(
3333
"thread backtrace --unfiltered",
3434
ordered=True,
35-
patterns=["frame.*foo", "frame.*std::__1::__function", "frame.*main"],
35+
patterns=["frame.*foo", "frame.*std::__.*::__function", "frame.*main"],
3636
)
3737

3838
@add_test_categories(["libc++"])

0 commit comments

Comments
 (0)