This revision was not accepted when it landed; it landed in state "Needs Review". This revision was automatically updated to reflect the committed changes. Closed by commit rG02def06e6036: [lldb] Fix step-avoid-regexp logging (authored by kastiglione). Herald added a project: All.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D119298/new/ https://reviews.llvm.org/D119298 Files: lldb/source/Target/ThreadPlanStepInRange.cpp Index: lldb/source/Target/ThreadPlanStepInRange.cpp =================================================================== --- lldb/source/Target/ThreadPlanStepInRange.cpp +++ lldb/source/Target/ThreadPlanStepInRange.cpp @@ -340,17 +340,13 @@ sc.GetFunctionName(Mangled::ePreferDemangledWithoutArguments) .GetCString(); if (frame_function_name) { - llvm::SmallVector<llvm::StringRef, 2> matches; - bool return_value = - avoid_regexp_to_use->Execute(frame_function_name, &matches); - if (return_value && matches.size() > 1) { - std::string match = matches[1].str(); + bool return_value = avoid_regexp_to_use->Execute(frame_function_name); + if (return_value) { LLDB_LOGF(GetLog(LLDBLog::Step), - "Stepping out of function \"%s\" because it matches " - "the avoid regexp \"%s\" - match substring: \"%s\".", + "Stepping out of function \"%s\" because it matches the " + "avoid regexp \"%s\".", frame_function_name, - avoid_regexp_to_use->GetText().str().c_str(), - match.c_str()); + avoid_regexp_to_use->GetText().str().c_str()); } return return_value; }
Index: lldb/source/Target/ThreadPlanStepInRange.cpp =================================================================== --- lldb/source/Target/ThreadPlanStepInRange.cpp +++ lldb/source/Target/ThreadPlanStepInRange.cpp @@ -340,17 +340,13 @@ sc.GetFunctionName(Mangled::ePreferDemangledWithoutArguments) .GetCString(); if (frame_function_name) { - llvm::SmallVector<llvm::StringRef, 2> matches; - bool return_value = - avoid_regexp_to_use->Execute(frame_function_name, &matches); - if (return_value && matches.size() > 1) { - std::string match = matches[1].str(); + bool return_value = avoid_regexp_to_use->Execute(frame_function_name); + if (return_value) { LLDB_LOGF(GetLog(LLDBLog::Step), - "Stepping out of function \"%s\" because it matches " - "the avoid regexp \"%s\" - match substring: \"%s\".", + "Stepping out of function \"%s\" because it matches the " + "avoid regexp \"%s\".", frame_function_name, - avoid_regexp_to_use->GetText().str().c_str(), - match.c_str()); + avoid_regexp_to_use->GetText().str().c_str()); } return return_value; }
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits