summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core/ModuleList.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Core/ModuleList.cpp')
-rw-r--r--lldb/source/Core/ModuleList.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index 449a800949e..07b20b8d91e 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -1011,6 +1011,7 @@ ModuleList::RemoveSharedModuleIfOrphaned (const Module *module_ptr)
bool
ModuleList::LoadScriptingResourcesInTarget (Target *target,
std::list<Error>& errors,
+ Stream *feedback_stream,
bool continue_on_error)
{
if (!target)
@@ -1021,16 +1022,18 @@ ModuleList::LoadScriptingResourcesInTarget (Target *target,
Error error;
if (module)
{
- module->LoadScriptingResourceInTarget(target, error);
- if (error.Fail() && error.AsCString())
+ if (!module->LoadScriptingResourceInTarget(target, error, feedback_stream))
{
- error.SetErrorStringWithFormat("unable to load scripting data for module %s - error reported was %s",
- module->GetFileSpec().GetFileNameStrippingExtension().GetCString(),
- error.AsCString());
- errors.push_back(error);
+ if (error.Fail() && error.AsCString())
+ {
+ error.SetErrorStringWithFormat("unable to load scripting data for module %s - error reported was %s",
+ module->GetFileSpec().GetFileNameStrippingExtension().GetCString(),
+ error.AsCString());
+ errors.push_back(error);
+ }
+ if (!continue_on_error)
+ return false;
}
- if (!continue_on_error)
- return false;
}
}
return errors.size() == 0;
OpenPOWER on IntegriCloud