commit 1bbaede5b9054779c8715bf559804be412b487f9
author Dawn Perchik <dawn@burble.org> Wed Oct 07 22:01:12 2015 +0000
committer Dawn Perchik <dawn@burble.org> Wed Oct 07 22:01:12 2015 +0000
tree 27512304b9ed990384b3924558dc1197de6f86d2
parent 6df48a97d2cee06e065d67f2da23db3d843d4b57

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

diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp
index 3dd962b..ec23717 100644
--- a/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/lldb/source/Commands/CommandObjectExpression.cpp
@@ -299,16 +299,7 @@
         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