diff options
Diffstat (limited to 'lldb/source/Expression')
| -rw-r--r-- | lldb/source/Expression/LLVMUserExpression.cpp | 10 | ||||
| -rw-r--r-- | lldb/source/Expression/UserExpression.cpp | 14 |
2 files changed, 17 insertions, 7 deletions
diff --git a/lldb/source/Expression/LLVMUserExpression.cpp b/lldb/source/Expression/LLVMUserExpression.cpp index cd28834a962..8c1c7bf3040 100644 --- a/lldb/source/Expression/LLVMUserExpression.cpp +++ b/lldb/source/Expression/LLVMUserExpression.cpp @@ -40,9 +40,13 @@ using namespace lldb_private; -LLVMUserExpression::LLVMUserExpression(ExecutionContextScope &exe_scope, const char *expr, const char *expr_prefix, - lldb::LanguageType language, ResultType desired_type) - : UserExpression(exe_scope, expr, expr_prefix, language, desired_type), +LLVMUserExpression::LLVMUserExpression(ExecutionContextScope &exe_scope, + const char *expr, + const char *expr_prefix, + lldb::LanguageType language, + ResultType desired_type, + const EvaluateExpressionOptions &options) + : UserExpression(exe_scope, expr, expr_prefix, language, desired_type, options), m_stack_frame_bottom(LLDB_INVALID_ADDRESS), m_stack_frame_top(LLDB_INVALID_ADDRESS), m_transformed_text(), diff --git a/lldb/source/Expression/UserExpression.cpp b/lldb/source/Expression/UserExpression.cpp index 23e93d34438..70f004ba25c 100644 --- a/lldb/source/Expression/UserExpression.cpp +++ b/lldb/source/Expression/UserExpression.cpp @@ -45,13 +45,18 @@ using namespace lldb_private; -UserExpression::UserExpression(ExecutionContextScope &exe_scope, const char *expr, const char *expr_prefix, - lldb::LanguageType language, ResultType desired_type) - : Expression(exe_scope), +UserExpression::UserExpression (ExecutionContextScope &exe_scope, + const char *expr, + const char *expr_prefix, + lldb::LanguageType language, + ResultType desired_type, + const EvaluateExpressionOptions &options) : + Expression(exe_scope), m_expr_text(expr), m_expr_prefix(expr_prefix ? expr_prefix : ""), m_language(language), - m_desired_type(desired_type) + m_desired_type(desired_type), + m_options (options) { } @@ -219,6 +224,7 @@ UserExpression::Evaluate (ExecutionContext &exe_ctx, full_prefix, language, desired_type, + options, error)); if (error.Fail()) { |
