2 files changed, 17 insertions, 17 deletions

diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
index 9a42ae0cdd9..0a5988e1795 100644
--- a/lldb/source/API/SBFrame.cpp
+++ b/lldb/source/API/SBFrame.cpp
@@ -343,12 +343,12 @@ SBFrame::Clear()
 SBValue
 SBFrame::FindVariable (const char *name)
 {
-    bool use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType  use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
     return FindVariable (name, use_dynamic);
 }
 
 SBValue
-SBFrame::FindVariable (const char *name, bool use_dynamic)
+SBFrame::FindVariable (const char *name, lldb::DynamicValueType use_dynamic)
 {
     VariableSP var_sp;
     SBValue sb_value;
@@ -389,12 +389,12 @@ SBFrame::FindVariable (const char *name, bool use_dynamic)
 SBValue
 SBFrame::FindValue (const char *name, ValueType value_type)
 {
-    bool use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
     return FindValue (name, value_type, use_dynamic);
 }
 
 SBValue
-SBFrame::FindValue (const char *name, ValueType value_type, bool use_dynamic)
+SBFrame::FindValue (const char *name, ValueType value_type, lldb::DynamicValueType use_dynamic)
 {
     SBValue sb_value;
     if (m_opaque_sp && name && name[0])
@@ -579,7 +579,7 @@ SBFrame::GetVariables (bool arguments,
                        bool statics,
                        bool in_scope_only)
 {
-    bool use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
     return GetVariables (arguments, locals, statics, in_scope_only, use_dynamic);
 }
 
@@ -588,7 +588,7 @@ SBFrame::GetVariables (bool arguments,
                        bool locals,
                        bool statics,
                        bool in_scope_only,
-                       bool use_dynamic)
+                       lldb::DynamicValueType  use_dynamic)
 {
     LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -706,12 +706,12 @@ SBFrame::GetDescription (SBStream &description)
 SBValue
 SBFrame::EvaluateExpression (const char *expr)
 {
-    bool use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
     return EvaluateExpression (expr, use_dynamic);
 }
 
 SBValue
-SBFrame::EvaluateExpression (const char *expr, bool fetch_dynamic_value)
+SBFrame::EvaluateExpression (const char *expr, lldb::DynamicValueType fetch_dynamic_value)
 {
     Mutex::Locker api_locker (m_opaque_sp->GetThread().GetProcess().GetTarget().GetAPIMutex());
 
@@ -732,8 +732,8 @@ SBFrame::EvaluateExpression (const char *expr, bool fetch_dynamic_value)
         exe_results = m_opaque_sp->GetThread().GetProcess().GetTarget().EvaluateExpression(expr, 
                                                                                            m_opaque_sp.get(), 
                                                                                            unwind_on_error, 
-                                                                                           fetch_dynamic_value, 
                                                                                            keep_in_memory, 
+                                                                                           fetch_dynamic_value, 
                                                                                            *expr_result);
     }
     
diff --git a/lldb/source/API/SBValue.cpp b/lldb/source/API/SBValue.cpp
index f499fae145f..4ed2c7d1ffe 100644
--- a/lldb/source/API/SBValue.cpp
+++ b/lldb/source/API/SBValue.cpp
@@ -339,12 +339,12 @@ SBValue::SetValueFromCString (const char *value_str)
 SBValue
 SBValue::GetChildAtIndex (uint32_t idx)
 {
-    bool use_dynamic_value = m_opaque_sp->GetUpdatePoint().GetTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType use_dynamic_value = m_opaque_sp->GetUpdatePoint().GetTarget()->GetPreferDynamicValue();
     return GetChildAtIndex (idx, use_dynamic_value);
 }
 
 SBValue
-SBValue::GetChildAtIndex (uint32_t idx, bool use_dynamic_value)
+SBValue::GetChildAtIndex (uint32_t idx, lldb::DynamicValueType use_dynamic)
 {
     lldb::ValueObjectSP child_sp;
 
@@ -353,11 +353,11 @@ SBValue::GetChildAtIndex (uint32_t idx, bool use_dynamic_value)
         child_sp = m_opaque_sp->GetChildAtIndex (idx, true);
     }
 
-    if (use_dynamic_value)
+    if (use_dynamic != lldb::eNoDynamicValues)
     {
         if (child_sp)
         {
-            lldb::ValueObjectSP dynamic_sp = child_sp->GetDynamicValue (true);
+            lldb::ValueObjectSP dynamic_sp = child_sp->GetDynamicValue (use_dynamic);
             if (dynamic_sp)
                 child_sp = dynamic_sp;
         }
@@ -391,12 +391,12 @@ SBValue::GetIndexOfChildWithName (const char *name)
 SBValue
 SBValue::GetChildMemberWithName (const char *name)
 {
-    bool use_dynamic_value = m_opaque_sp->GetUpdatePoint().GetTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType use_dynamic_value = m_opaque_sp->GetUpdatePoint().GetTarget()->GetPreferDynamicValue();
     return GetChildMemberWithName (name, use_dynamic_value);
 }
 
 SBValue
-SBValue::GetChildMemberWithName (const char *name, bool use_dynamic_value)
+SBValue::GetChildMemberWithName (const char *name, lldb::DynamicValueType use_dynamic_value)
 {
     lldb::ValueObjectSP child_sp;
     const ConstString str_name (name);
@@ -406,11 +406,11 @@ SBValue::GetChildMemberWithName (const char *name, bool use_dynamic_value)
         child_sp = m_opaque_sp->GetChildMemberWithName (str_name, true);
     }
 
-    if (use_dynamic_value)
+    if (use_dynamic_value != lldb::eNoDynamicValues)
     {
         if (child_sp)
         {
-            lldb::ValueObjectSP dynamic_sp = child_sp->GetDynamicValue (true);
+            lldb::ValueObjectSP dynamic_sp = child_sp->GetDynamicValue (use_dynamic_value);
             if (dynamic_sp)
                 child_sp = dynamic_sp;
         }