From 1bbaede5b9054779c8715bf559804be412b487f9 Mon Sep 17 00:00:00 2001 From: Dawn Perchik Date: Wed, 7 Oct 2015 22:01:12 +0000 Subject: Decide on the expression language inside UserExpression When the target settings are consulted to decide the expression language is decided in CommandObjectExpression, this doesn't help if you're running SBFrame::EvaluateExpression(). Moving the logic into UserExpression fixes this. Based on patch from scallanan@apple.com Reviewed by: dawn Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D13267 llvm-svn: 249624 --- lldb/source/Commands/CommandObjectExpression.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'lldb/source/Commands/CommandObjectExpression.cpp') diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp index 3dd962b413b..ec23717c77f 100644 --- a/lldb/source/Commands/CommandObjectExpression.cpp +++ b/lldb/source/Commands/CommandObjectExpression.cpp @@ -299,16 +299,7 @@ CommandObjectExpression::EvaluateExpression options.SetUseDynamic(m_varobj_options.use_dynamic); options.SetTryAllThreads(m_command_options.try_all_threads); options.SetDebug(m_command_options.debug); - - // If the language was not specified in the expression command, - // set it to the language in the target's properties if - // specified, else default to the language for the frame. - if (m_command_options.language != eLanguageTypeUnknown) - options.SetLanguage(m_command_options.language); - else if (target->GetLanguage() != eLanguageTypeUnknown) - options.SetLanguage(target->GetLanguage()); - else if (frame) - options.SetLanguage(frame->GetLanguage()); + options.SetLanguage(m_command_options.language); // If there is any chance we are going to stop and want to see // what went wrong with our expression, we should generate debug info -- cgit v1.2.3