From d616a6bd107fcc0dc74f79e174e0b4fe27b26fe6 Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Thu, 22 Apr 2021 18:44:58 +0200 Subject: [lldb] Fix that the expression commands --top-level flag overwrites --allow-jit false The `--allow-jit` flag allows the user to force the IR interpreter to run the provided expression. The `--top-level` flag parses and injects the code as if its in the top level scope of a source file. Both flags just change the ExecutionPolicy of the expression: * `--allow-jit true` -> doesn't change anything (its the default) * `--allow-jit false` -> ExecutionPolicyNever * `--top-level` -> ExecutionPolicyTopLevel Passing `--allow-jit false` and `--top-level` currently causes the `--top-level` to silently overwrite the ExecutionPolicy value that was set by `--allow-jit false`. There isn't any ExecutionPolicy value that says "top-level but only interpret", so I would say we reject this combination of flags until someone finds time to refactor top-level feature out of the ExecutionPolicy enum. The SBExpressionOptions suffer from a similar symptom as `SetTopLevel` and `SetAllowJIT` just silently disable each other. But those functions don't have any error handling, so not a lot we can do about this in the meantime. Reviewed By: labath, kastiglione Differential Revision: https://reviews.llvm.org/D91780 --- lldb/source/Commands/CommandObjectExpression.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lldb/source/Commands/CommandObjectExpression.cpp') diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp index c7866f9..4f4318e 100644 --- a/lldb/source/Commands/CommandObjectExpression.cpp +++ b/lldb/source/Commands/CommandObjectExpression.cpp @@ -408,6 +408,13 @@ bool CommandObjectExpression::EvaluateExpression(llvm::StringRef expr, lldb::ValueObjectSP result_valobj_sp; StackFrame *frame = exe_ctx.GetFramePtr(); + if (m_command_options.top_level && !m_command_options.allow_jit) { + result.AppendErrorWithFormat( + "Can't disable JIT compilation for top-level expressions.\n"); + result.SetStatus(eReturnStatusFailed); + return false; + } + const EvaluateExpressionOptions options = GetEvalOptions(target); ExpressionResults success = target.EvaluateExpression( expr, frame, result_valobj_sp, options, &m_fixed_expression); -- cgit v1.1