This revision was automatically updated to reflect the committed changes.
Closed by commit rGe31f99464216: [lldb] Improve error message when evaluating
expression when not stopped (authored by JDevlieghere).
Herald added a project: LLDB.
Changed prior to commit:
https://reviews.llvm.org/D151497?vs=525861&id=526082#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D151497/new/
https://reviews.llvm.org/D151497
Files:
lldb/source/Expression/UserExpression.cpp
lldb/source/Expression/UtilityFunction.cpp
lldb/test/Shell/Expr/TestExited.test
Index: lldb/test/Shell/Expr/TestExited.test
===================================================================
--- /dev/null
+++ lldb/test/Shell/Expr/TestExited.test
@@ -0,0 +1,3 @@
+# RUN: %clangxx_host %p/Inputs/call-function.cpp -g -o %t
+# RUN: %lldb %t -o 'r' -o 'expr strlen("")' 2>&1 | FileCheck %s
+# CHECK: error: unable to evaluate expression while the process is exited: the
process must be stopped because the expression might require allocating memory.
Index: lldb/source/Expression/UtilityFunction.cpp
===================================================================
--- lldb/source/Expression/UtilityFunction.cpp
+++ lldb/source/Expression/UtilityFunction.cpp
@@ -21,6 +21,7 @@
#include "lldb/Target/Target.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/State.h"
#include "lldb/Utility/Stream.h"
using namespace lldb_private;
@@ -64,11 +65,13 @@
error.SetErrorString("Can't make a function caller without a process.");
return nullptr;
}
- // Since we might need to call allocate memory and maybe call code to make
+ // Since we might need to allocate memory and maybe call code to make
// the caller, we need to be stopped.
if (process_sp->GetState() != lldb::eStateStopped) {
- error.SetErrorString("Can't make a function caller while the process is "
- "running");
+ error.SetErrorStringWithFormatv(
+ "Can't make a function caller while the process is {0}: the process "
+ "must be stopped to allocate memory.",
+ StateAsCString(process_sp->GetState()));
return nullptr;
}
Index: lldb/source/Expression/UserExpression.cpp
===================================================================
--- lldb/source/Expression/UserExpression.cpp
+++ lldb/source/Expression/UserExpression.cpp
@@ -39,6 +39,7 @@
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/LLDBLog.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/State.h"
#include "lldb/Utility/StreamString.h"
using namespace lldb_private;
@@ -202,15 +203,18 @@
return execution_results;
}
- // Since we might need to call allocate memory and maybe call code to make
- // the caller, we need to be stopped.
+
+ // Since we might need to allocate memory, we need to be stopped to run
+ // an expression.
if (process != nullptr && process->GetState() != lldb::eStateStopped) {
- error.SetErrorString("Can't make a function caller while the process is "
- "running");
+ error.SetErrorStringWithFormatv(
+ "unable to evaluate expression while the process is {0}: the process "
+ "must be stopped because the expression might require allocating "
+ "memory.",
+ StateAsCString(process->GetState()));
return execution_results;
}
-
// Explicitly force the IR interpreter to evaluate the expression when the
// there is no process that supports running the expression for us. Don't
// change the execution policy if we have the special top-level policy that
Index: lldb/test/Shell/Expr/TestExited.test
===================================================================
--- /dev/null
+++ lldb/test/Shell/Expr/TestExited.test
@@ -0,0 +1,3 @@
+# RUN: %clangxx_host %p/Inputs/call-function.cpp -g -o %t
+# RUN: %lldb %t -o 'r' -o 'expr strlen("")' 2>&1 | FileCheck %s
+# CHECK: error: unable to evaluate expression while the process is exited: the process must be stopped because the expression might require allocating memory.
Index: lldb/source/Expression/UtilityFunction.cpp
===================================================================
--- lldb/source/Expression/UtilityFunction.cpp
+++ lldb/source/Expression/UtilityFunction.cpp
@@ -21,6 +21,7 @@
#include "lldb/Target/Target.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/State.h"
#include "lldb/Utility/Stream.h"
using namespace lldb_private;
@@ -64,11 +65,13 @@
error.SetErrorString("Can't make a function caller without a process.");
return nullptr;
}
- // Since we might need to call allocate memory and maybe call code to make
+ // Since we might need to allocate memory and maybe call code to make
// the caller, we need to be stopped.
if (process_sp->GetState() != lldb::eStateStopped) {
- error.SetErrorString("Can't make a function caller while the process is "
- "running");
+ error.SetErrorStringWithFormatv(
+ "Can't make a function caller while the process is {0}: the process "
+ "must be stopped to allocate memory.",
+ StateAsCString(process_sp->GetState()));
return nullptr;
}
Index: lldb/source/Expression/UserExpression.cpp
===================================================================
--- lldb/source/Expression/UserExpression.cpp
+++ lldb/source/Expression/UserExpression.cpp
@@ -39,6 +39,7 @@
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/LLDBLog.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/State.h"
#include "lldb/Utility/StreamString.h"
using namespace lldb_private;
@@ -202,15 +203,18 @@
return execution_results;
}
- // Since we might need to call allocate memory and maybe call code to make
- // the caller, we need to be stopped.
+
+ // Since we might need to allocate memory, we need to be stopped to run
+ // an expression.
if (process != nullptr && process->GetState() != lldb::eStateStopped) {
- error.SetErrorString("Can't make a function caller while the process is "
- "running");
+ error.SetErrorStringWithFormatv(
+ "unable to evaluate expression while the process is {0}: the process "
+ "must be stopped because the expression might require allocating "
+ "memory.",
+ StateAsCString(process->GetState()));
return execution_results;
}
-
// Explicitly force the IR interpreter to evaluate the expression when the
// there is no process that supports running the expression for us. Don't
// change the execution policy if we have the special top-level policy that
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
