1 files changed, 17 insertions, 34 deletions

diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
index d51f59c2307..da1d32f2e80 100644
--- a/lldb/source/API/SBFrame.cpp
+++ b/lldb/source/API/SBFrame.cpp
@@ -44,7 +44,6 @@
 #include "lldb/API/SBStream.h"
 #include "lldb/API/SBSymbolContext.h"
 #include "lldb/API/SBThread.h"
-#include "lldb/API/SBVariablesOptions.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -1076,17 +1075,7 @@ SBFrame::GetVariables (bool arguments,
     if (frame && target)
     {
         lldb::DynamicValueType use_dynamic = frame->CalculateTarget()->GetPreferDynamicValue();
-        const bool include_runtime_support_values = target ? target->GetDisplayRuntimeSupportValues() : false;
-        
-        SBVariablesOptions options;
-        options.SetIncludeArguments(arguments);
-        options.SetIncludeLocals(locals);
-        options.SetIncludeStatics(statics);
-        options.SetInScopeOnly(in_scope_only);
-        options.SetIncludeRuntimeSupportValues(include_runtime_support_values);
-        options.SetUseDynamic(use_dynamic);
-        
-        value_list = GetVariables (options);
+        value_list = GetVariables (arguments, locals, statics, in_scope_only, use_dynamic);
     }
     return value_list;
 }
@@ -1100,19 +1089,22 @@ SBFrame::GetVariables (bool arguments,
 {
     ExecutionContext exe_ctx(m_opaque_sp.get());
     Target *target = exe_ctx.GetTargetPtr();
-    const bool include_runtime_support_values = target ? target->GetDisplayRuntimeSupportValues() : false;
-    SBVariablesOptions options;
-    options.SetIncludeArguments(arguments);
-    options.SetIncludeLocals(locals);
-    options.SetIncludeStatics(statics);
-    options.SetInScopeOnly(in_scope_only);
-    options.SetIncludeRuntimeSupportValues(include_runtime_support_values);
-    options.SetUseDynamic(use_dynamic);
-    return GetVariables(options);
+    bool include_runtime_support_values = target ? target->GetDisplayRuntimeSupportValues() : false;
+    return GetVariables(arguments,
+                        locals,
+                        statics,
+                        in_scope_only,
+                        include_runtime_support_values,
+                        use_dynamic);
 }
 
 SBValueList
-SBFrame::GetVariables (const lldb::SBVariablesOptions& options)
+SBFrame::GetVariables (bool arguments,
+                       bool locals,
+                       bool statics,
+                       bool in_scope_only,
+                       bool include_runtime_support_values,
+                       lldb::DynamicValueType  use_dynamic)
 {
     Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1123,19 +1115,10 @@ SBFrame::GetVariables (const lldb::SBVariablesOptions& options)
     StackFrame *frame = NULL;
     Target *target = exe_ctx.GetTargetPtr();
 
-    const bool statics = options.GetIncludeStatics();
-    const bool arguments = options.GetIncludeArguments();
-    const bool locals = options.GetIncludeLocals();
-    const bool in_scope_only = options.GetInScopeOnly();
-    const bool include_runtime_support_values = options.GetIncludeRuntimeSupportValues();
-    const lldb::DynamicValueType use_dynamic = options.GetUseDynamic();
-    
     if (log)
-        log->Printf ("SBFrame::GetVariables (arguments=%i, locals=%i, statics=%i, in_scope_only=%i runtime=%i dynamic=%i)",
-                     arguments, locals,
-                     statics, in_scope_only,
-                     include_runtime_support_values, use_dynamic);
-    
+        log->Printf ("SBFrame::GetVariables (arguments=%i, locals=%i, statics=%i, in_scope_only=%i)",
+                     arguments, locals, statics, in_scope_only);
+
     Process *process = exe_ctx.GetProcessPtr();
     if (target && process)
     {