diff options
| -rw-r--r-- | lldb/include/lldb/Expression/Expression.h | 4 | ||||
| -rw-r--r-- | lldb/include/lldb/Expression/LLVMUserExpression.h | 2 | ||||
| -rw-r--r-- | lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lldb/include/lldb/Expression/Expression.h b/lldb/include/lldb/Expression/Expression.h index 2f0183cf269..fca5fb9119c 100644 --- a/lldb/include/lldb/Expression/Expression.h +++ b/lldb/include/lldb/Expression/Expression.h @@ -64,6 +64,10 @@ public: /// default, return eLanguageTypeUnknown. virtual lldb::LanguageType Language() { return lldb::eLanguageTypeUnknown; } + /// Return the Materializer that the parser should use when registering + /// external values. + virtual Materializer *GetMaterializer() { return nullptr; } + /// Return the desired result type of the function, or eResultTypeAny if /// indifferent. virtual ResultType DesiredResultType() { return eResultTypeAny; } diff --git a/lldb/include/lldb/Expression/LLVMUserExpression.h b/lldb/include/lldb/Expression/LLVMUserExpression.h index c3b8ed506f1..5f4c43cdea2 100644 --- a/lldb/include/lldb/Expression/LLVMUserExpression.h +++ b/lldb/include/lldb/Expression/LLVMUserExpression.h @@ -63,6 +63,8 @@ public: bool CanInterpret() override { return m_can_interpret; } + Materializer *GetMaterializer() override { return m_materializer_up.get(); } + /// Return the string that the parser should parse. Must be a full /// translation unit. const char *Text() override { return m_transformed_text.c_str(); } diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp index da1ca785635..60592cac517 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp @@ -576,7 +576,7 @@ bool ClangUserExpression::Parse(DiagnosticManager &diagnostic_manager, auto on_exit = llvm::make_scope_exit([this]() { ResetDeclMap(); }); - if (!DeclMap()->WillParse(exe_ctx, m_materializer_up.get())) { + if (!DeclMap()->WillParse(exe_ctx, GetMaterializer())) { diagnostic_manager.PutString( eDiagnosticSeverityError, "current process state is unsuitable for expression parsing"); @@ -764,7 +764,7 @@ bool ClangUserExpression::Complete(ExecutionContext &exe_ctx, auto on_exit = llvm::make_scope_exit([this]() { ResetDeclMap(); }); - if (!DeclMap()->WillParse(exe_ctx, m_materializer_up.get())) { + if (!DeclMap()->WillParse(exe_ctx, GetMaterializer())) { diagnostic_manager.PutString( eDiagnosticSeverityError, "current process state is unsuitable for expression parsing"); |
