LLDB: properly handle step return failures

1ikeadragon · Dec 8, 2022 · 99eab0d · 99eab0d
1 parent 594c90e
commit 99eab0d
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/core/adapters/lldbadapter.cpp b/core/adapters/lldbadapter.cpp
@@ -1106,7 +1106,17 @@ DebugStopReason LldbAdapter::StepReturn()
 	//			return DebugStopReason::InternalError;
 	//	}
 	//#else
-	InvokeBackendCommand("finish");
+	auto result = InvokeBackendCommand("finish");
+	if (result.rfind("error: ", 0) == 0)
+	{
+		DebuggerEvent event;
+		event.type = ErrorEventType;
+		event.data.errorData.shortError = "Step return failed";
+		event.data.errorData.error = fmt::format("LLDB: step return failed, {}", result);
+		PostDebuggerEvent(event);
+		return DebugStopReason::InternalError;
+	}
+
 	//#endif
 	return StopReason();
 }