From 6b2979c12300b90a1e69791d43ee9cff14f4265e Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Mon, 10 Feb 2020 12:43:59 -0800 Subject: Revert "[lldb] Fix+re-enable Assert StackFrame Recognizer on Linux" This reverts commit 1a39f1b966a8d8f15ed0d5a832d5097cccefe93b as it breaks macOS. --- lldb/source/Commands/CommandObjectFrame.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lldb/source/Commands/CommandObjectFrame.cpp') diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index 5af9e2e..d86b50b 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -881,7 +881,7 @@ bool CommandObjectFrameRecognizerAdd::DoExecute(Args &command, } else { auto module = ConstString(m_options.m_module); auto func = ConstString(m_options.m_function); - StackFrameRecognizerManager::AddRecognizer(recognizer_sp, module, func, {}); + StackFrameRecognizerManager::AddRecognizer(recognizer_sp, module, func); } #endif @@ -960,13 +960,12 @@ protected: StackFrameRecognizerManager::ForEach( [&result, &any_printed](uint32_t recognizer_id, std::string name, std::string function, std::string symbol, - std::string alternate_symbol, bool regexp) { + bool regexp) { if (name == "") name = "(internal)"; result.GetOutputStream().Printf( - "%d: %s, module %s, function %s{%s}%s\n", recognizer_id, - name.c_str(), function.c_str(), symbol.c_str(), - alternate_symbol.c_str(), regexp ? " (regexp)" : ""); + "%d: %s, module %s, function %s%s\n", recognizer_id, name.c_str(), + function.c_str(), symbol.c_str(), regexp ? " (regexp)" : ""); any_printed = true; }); -- cgit v1.1