jankratochvil updated this revision to Diff 243353.
jankratochvil retitled this revision from "Fix+re-enable Assert StackFrame
Recognizer" to "Fix+re-enable Assert StackFrame Recognizer on Linux".
jankratochvil edited the summary of this revision.
Herald added a subscriber: jfb.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D74252/new/
https://reviews.llvm.org/D74252
Files:
lldb/source/Target/AssertFrameRecognizer.cpp
lldb/test/Shell/Recognizer/assert.test
Index: lldb/test/Shell/Recognizer/assert.test
===================================================================
--- lldb/test/Shell/Recognizer/assert.test
+++ lldb/test/Shell/Recognizer/assert.test
@@ -1,4 +1,4 @@
-# UNSUPPORTED: system-windows, system-linux
+# UNSUPPORTED: system-windows
# RUN: %clang_host -g -O0 %S/Inputs/assert.c -o %t.out
# RUN: %lldb -b -s %s %t.out | FileCheck %s
run
Index: lldb/source/Target/AssertFrameRecognizer.cpp
===================================================================
--- lldb/source/Target/AssertFrameRecognizer.cpp
+++ lldb/source/Target/AssertFrameRecognizer.cpp
@@ -16,26 +16,6 @@
using namespace lldb_private;
namespace lldb_private {
-/// Checkes if the module containing a symbol has debug info.
-///
-/// \param[in] target
-/// The target containing the module.
-/// \param[in] module_spec
-/// The module spec that should contain the symbol.
-/// \param[in] symbol_name
-/// The symbol's name that should be contained in the debug info.
-/// \return
-/// If \b true the symbol was found, \b false otherwise.
-bool ModuleHasDebugInfo(Target &target, FileSpec &module_spec,
- StringRef symbol_name) {
- ModuleSP module_sp = target.GetImages().FindFirstModule(module_spec);
-
- if (!module_sp)
- return false;
-
- return module_sp->FindFirstSymbolWithNameAndType(ConstString(symbol_name));
-}
-
/// Fetches the abort frame location depending on the current platform.
///
/// \param[in] process_sp
@@ -43,26 +23,26 @@
/// the target and the platform.
/// \return
/// If the platform is supported, returns an optional tuple containing
-/// the abort module as a \a FileSpec and the symbol name as a \a StringRef.
+/// the abort module as a \a FileSpec and two symbol names as two \a
+/// StringRef. The second \a StringRef may be empty.
/// Otherwise, returns \a llvm::None.
-llvm::Optional<std::tuple<FileSpec, StringRef>>
+llvm::Optional<std::tuple<FileSpec, StringRef, StringRef>>
GetAbortLocation(Process *process) {
Target &target = process->GetTarget();
FileSpec module_spec;
- StringRef symbol_name;
+ StringRef symbol_name1, symbol_name2;
switch (target.GetArchitecture().GetTriple().getOS()) {
case llvm::Triple::Darwin:
case llvm::Triple::MacOSX:
module_spec = FileSpec("libsystem_kernel.dylib");
- symbol_name = "__pthread_kill";
+ symbol_name1 = "__pthread_kill";
break;
case llvm::Triple::Linux:
module_spec = FileSpec("libc.so.6");
- symbol_name = "__GI_raise";
- if (!ModuleHasDebugInfo(target, module_spec, symbol_name))
- symbol_name = "raise";
+ symbol_name1 = "raise";
+ symbol_name2 = "__GI_raise";
break;
default:
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_UNWIND));
@@ -70,7 +50,7 @@
return llvm::None;
}
- return std::make_tuple(module_spec, symbol_name);
+ return std::make_tuple(module_spec, symbol_name1, symbol_name2);
}
/// Fetches the assert frame location depending on the current platform.
@@ -80,27 +60,26 @@
/// the target and the platform.
/// \return
/// If the platform is supported, returns an optional tuple containing
-/// the asserting frame module as a \a FileSpec and the symbol name as a \a
-/// StringRef.
+/// the asserting frame module as a \a FileSpec and two possible symbol
+/// names as two \a StringRef. The second \a StringRef may be empty.
/// Otherwise, returns \a llvm::None.
-llvm::Optional<std::tuple<FileSpec, StringRef>>
+llvm::Optional<std::tuple<FileSpec, StringRef, StringRef>>
GetAssertLocation(Process *process) {
Target &target = process->GetTarget();
FileSpec module_spec;
- StringRef symbol_name;
+ StringRef symbol_name1, symbol_name2;
switch (target.GetArchitecture().GetTriple().getOS()) {
case llvm::Triple::Darwin:
case llvm::Triple::MacOSX:
module_spec = FileSpec("libsystem_c.dylib");
- symbol_name = "__assert_rtn";
+ symbol_name1 = "__assert_rtn";
break;
case llvm::Triple::Linux:
module_spec = FileSpec("libc.so.6");
- symbol_name = "__GI___assert_fail";
- if (!ModuleHasDebugInfo(target, module_spec, symbol_name))
- symbol_name = "__assert_fail";
+ symbol_name1 = "__assert_fail";
+ symbol_name2 = "__GI___assert_fail";
break;
default:
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_UNWIND));
@@ -108,7 +87,7 @@
return llvm::None;
}
- return std::make_tuple(module_spec, symbol_name);
+ return std::make_tuple(module_spec, symbol_name1, symbol_name2);
}
void RegisterAssertFrameRecognizer(Process *process) {
@@ -120,12 +99,16 @@
return;
FileSpec module_spec;
- StringRef function_name;
- std::tie(module_spec, function_name) = *abort_location;
+ StringRef function_name1, function_name2;
+ std::tie(module_spec, function_name1, function_name2) = *abort_location;
StackFrameRecognizerManager::AddRecognizer(
StackFrameRecognizerSP(new AssertFrameRecognizer()),
- module_spec.GetFilename(), ConstString(function_name), false);
+ module_spec.GetFilename(), ConstString(function_name1), false);
+ if (!function_name2.empty())
+ StackFrameRecognizerManager::AddRecognizer(
+ StackFrameRecognizerSP(new AssertFrameRecognizer()),
+ module_spec.GetFilename(), ConstString(function_name2), false);
});
}
@@ -142,8 +125,8 @@
return RecognizedStackFrameSP();
FileSpec module_spec;
- StringRef function_name;
- std::tie(module_spec, function_name) = *assert_location;
+ StringRef function_name1, function_name2;
+ std::tie(module_spec, function_name1, function_name2) = *assert_location;
const uint32_t frames_to_fetch = 5;
const uint32_t last_frame_index = frames_to_fetch - 1;
@@ -163,8 +146,12 @@
SymbolContext sym_ctx =
prev_frame_sp->GetSymbolContext(eSymbolContextEverything);
- if (sym_ctx.module_sp->GetFileSpec().FileEquals(module_spec) &&
- sym_ctx.GetFunctionName() == ConstString(function_name)) {
+ if (!sym_ctx.module_sp->GetFileSpec().FileEquals(module_spec))
+ continue;
+
+ ConstString func_name = sym_ctx.GetFunctionName();
+ if (func_name == ConstString(function_name1) || function_name2.empty() ||
+ func_name == ConstString(function_name2)) {
// We go a frame beyond the assert location because the most relevant
// frame for the user is the one in which the assert function was called.
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
