summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/source/Expression/DWARFExpression.cpp2
-rw-r--r--lldb/source/Interpreter/Args.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp
index 760952137c0..827bddd8e7b 100644
--- a/lldb/source/Expression/DWARFExpression.cpp
+++ b/lldb/source/Expression/DWARFExpression.cpp
@@ -2875,7 +2875,7 @@ DWARFExpression::Evaluate
if (cfa != LLDB_INVALID_ADDRESS)
{
stack.push_back(Scalar(cfa));
- stack.back().SetValueType (Value::eValueTypeHostAddress);
+ stack.back().SetValueType (Value::eValueTypeLoadAddress);
}
else
if (error_ptr)
diff --git a/lldb/source/Interpreter/Args.cpp b/lldb/source/Interpreter/Args.cpp
index 56fe53712d6..75c77d40d56 100644
--- a/lldb/source/Interpreter/Args.cpp
+++ b/lldb/source/Interpreter/Args.cpp
@@ -685,7 +685,7 @@ Args::ParseOptions (Options &options)
}
}
// Call the callback with the option
- if (long_options_index >= 0)
+ if (long_options_index >= 0 && long_options[long_options_index].definition)
{
const OptionDefinition *def = long_options[long_options_index].definition;
CommandInterpreter &interpreter = options.GetInterpreter();
OpenPOWER on IntegriCloud