Skip to content

Commit 954d042

Browse files
medismailbenmedismailben
committed
Revert "[lldb/Target] Add Assert StackFrame Recognizer"
This reverts commit 03a6b85. The test doesn't pass on Debian.
1 parent ac9b2a6 commit 954d042

File tree

17 files changed

+21
-380
lines changed

17 files changed

+21
-380
lines changed

‎lldb/docs/use/formatting.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ A complete list of currently supported format string variables is listed below:
134134
+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
135135
| ``thread.queue`` | The queue name of the thread if the target OS supports dispatch queues |
136136
+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
137-
| ``thread.stop-reason`` | A textual reason why the thread stopped. If the thread have a recognized frame, this displays its recognized stop reason. Otherwise, gets the stop info description. |
138-
+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
139-
| ``thread.stop-reason-raw`` | A textual reason why the thread stopped. Always returns stop info description. |
137+
| ``thread.stop-reason`` | A textual reason each thread stopped |
140138
+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
141139
| ``thread.return-value`` | The return value of the latest step operation (currently only for step-out.) |
142140
+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

‎lldb/include/lldb/Core/FormatEntity.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ class FormatEntity {
6161
ThreadName,
6262
ThreadQueue,
6363
ThreadStopReason,
64-
ThreadStopReasonRaw,
6564
ThreadReturnValue,
6665
ThreadCompletedExpression,
6766
ScriptThread,

‎lldb/include/lldb/Target/AssertFrameRecognizer.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎lldb/include/lldb/Target/StackFrameRecognizer.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "lldb/Core/ValueObject.h"
1313
#include "lldb/Core/ValueObjectList.h"
1414
#include "lldb/Symbol/VariableList.h"
15-
#include "lldb/Target/StopInfo.h"
1615
#include "lldb/Utility/StructuredData.h"
1716
#include "lldb/lldb-private-forward.h"
1817
#include "lldb/lldb-public.h"
@@ -34,8 +33,6 @@ class RecognizedStackFrame
3433
virtual lldb::ValueObjectSP GetExceptionObject() {
3534
return lldb::ValueObjectSP();
3635
}
37-
virtual lldb::StackFrameSP GetMostRelevantFrame() { return nullptr; };
38-
virtual llvm::StringRef GetStopDescription() { return ""; }
3936
virtual ~RecognizedStackFrame(){};
4037

4138
protected:

‎lldb/include/lldb/Target/Thread.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,6 @@ class Thread : public std::enable_shared_from_this<Thread>,
216216

217217
virtual void RefreshStateAfterStop() = 0;
218218

219-
void SelectMostRelevantFrame();
220-
221-
llvm::StringRef GetStopDescription();
222-
223-
llvm::StringRef GetStopDescriptionRaw();
224-
225219
void WillStop();
226220

227221
bool ShouldStop(Event *event_ptr);

‎lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,12 @@ def set_breakpoint(self, line):
104104
def check_stop_reason(self):
105105
matched = lldbplatformutil.match_android_device(
106106
self.getArchitecture(), valid_api_levels=list(range(1, 16 + 1)))
107-
108-
target = self.dbg.GetTargetAtIndex(0)
109-
process = target.GetProcess()
110-
111-
thread = lldbutil.get_stopped_thread(process, lldb.eStopReasonSignal)
112-
113-
stop_reason = 'stop reason = ' + thread.GetStopDescription(256)
107+
if matched:
108+
# On android until API-16 the abort() call ended in a sigsegv
109+
# instead of in a sigabrt
110+
stop_reason = 'stop reason = signal SIGSEGV'
111+
else:
112+
stop_reason = 'stop reason = signal SIGABRT'
114113

115114
# The stop reason of the thread should be an abort signal or exception.
116115
self.expect("thread list", STOPPED_DUE_TO_ASSERT,
@@ -174,22 +173,6 @@ def inferior_asserting_registers(self):
174173
self.runCmd("run", RUN_SUCCEEDED)
175174
self.check_stop_reason()
176175

177-
# change current frame to frame 0, since recognizer might have selected
178-
# different frame.
179-
target = self.dbg.GetTargetAtIndex(0)
180-
self.assertTrue(target, VALID_TARGET)
181-
182-
process = target.GetProcess()
183-
self.assertTrue(process.IsValid(), "current process is valid")
184-
185-
thread = process.GetSelectedThread()
186-
self.assertTrue(thread.IsValid(), "current thread is valid")
187-
188-
thread.SetSelectedFrame(0)
189-
frame = thread.GetSelectedFrame()
190-
191-
self.assertTrue(thread.GetFrameAtIndex(0) == frame, "Frame #0 selected")
192-
193176
# lldb should be able to read from registers from the inferior after
194177
# asserting.
195178
lldbplatformutil.check_first_register_readable(self)

‎lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def test_objc_exceptions_at_throw(self):
2525
launch_info = lldb.SBLaunchInfo(["a.out", "0"])
2626
lldbutil.run_to_name_breakpoint(self, "objc_exception_throw", launch_info=launch_info)
2727

28-
self.expect("thread list",
29-
substrs=['stopped', 'stop reason = hit Objective-C exception'])
28+
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
29+
substrs=['stopped', 'stop reason = breakpoint'])
3030

3131
self.expect('thread exception', substrs=[
3232
'(NSException *) exception = ',

‎lldb/source/API/SBThread.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,7 @@ size_t SBThread::GetStopDescription(char *dst, size_t dst_len) {
325325

326326
StopInfoSP stop_info_sp = exe_ctx.GetThreadPtr()->GetStopInfo();
327327
if (stop_info_sp) {
328-
const char *stop_desc =
329-
exe_ctx.GetThreadPtr()->GetStopDescription().data();
328+
const char *stop_desc = stop_info_sp->GetDescription();
330329
if (stop_desc) {
331330
if (dst)
332331
return ::snprintf(dst, dst_len, "%s", stop_desc);

‎lldb/source/Core/FormatEntity.cpp

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ static FormatEntity::Entry::Definition g_thread_child_entries[] = {
166166
ENTRY("queue", ThreadQueue),
167167
ENTRY("name", ThreadName),
168168
ENTRY("stop-reason", ThreadStopReason),
169-
ENTRY("stop-reason-raw", ThreadStopReasonRaw),
170169
ENTRY("return-value", ThreadReturnValue),
171170
ENTRY("completed-expression", ThreadCompletedExpression),
172171
};
@@ -329,7 +328,6 @@ const char *FormatEntity::Entry::TypeToCString(Type t) {
329328
ENUM_TO_CSTR(ThreadName);
330329
ENUM_TO_CSTR(ThreadQueue);
331330
ENUM_TO_CSTR(ThreadStopReason);
332-
ENUM_TO_CSTR(ThreadStopReasonRaw);
333331
ENUM_TO_CSTR(ThreadReturnValue);
334332
ENUM_TO_CSTR(ThreadCompletedExpression);
335333
ENUM_TO_CSTR(ScriptThread);
@@ -1275,23 +1273,15 @@ bool FormatEntity::Format(const Entry &entry, Stream &s,
12751273

12761274
case Entry::Type::ThreadStopReason:
12771275
if (exe_ctx) {
1278-
if (Thread *thread = exe_ctx->GetThreadPtr()) {
1279-
llvm::StringRef stop_description = thread->GetStopDescription();
1280-
if (!stop_description.empty()) {
1281-
s.PutCString(stop_description);
1282-
return true;
1283-
}
1284-
}
1285-
}
1286-
return false;
1287-
1288-
case Entry::Type::ThreadStopReasonRaw:
1289-
if (exe_ctx) {
1290-
if (Thread *thread = exe_ctx->GetThreadPtr()) {
1291-
llvm::StringRef stop_description = thread->GetStopDescriptionRaw();
1292-
if (!stop_description.empty()) {
1293-
s.PutCString(stop_description);
1294-
return true;
1276+
Thread *thread = exe_ctx->GetThreadPtr();
1277+
if (thread) {
1278+
StopInfoSP stop_info_sp = thread->GetStopInfo();
1279+
if (stop_info_sp && stop_info_sp->IsValid()) {
1280+
const char *cstr = stop_info_sp->GetDescription();
1281+
if (cstr && cstr[0]) {
1282+
s.PutCString(cstr);
1283+
return true;
1284+
}
12951285
}
12961286
}
12971287
}

‎lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,10 +2673,6 @@ class ObjCExceptionRecognizedStackFrame : public RecognizedStackFrame {
26732673
ValueObjectSP exception;
26742674

26752675
lldb::ValueObjectSP GetExceptionObject() override { return exception; }
2676-
2677-
llvm::StringRef GetStopDescription() override {
2678-
return "hit Objective-C exception";
2679-
}
26802676
};
26812677

26822678
class ObjCExceptionThrowFrameRecognizer : public StackFrameRecognizer {

0 commit comments

Comments
 (0)