[Lldb-commits] [lldb] r215936 - Don't search for module resources at all if the setting is set to "false".

[Greg Clayton]

Author: gclayton
Date: Mon Aug 18 16:08:44 2014
New Revision: 215936

URL: http://llvm.org/viewvc/llvm-project?rev=215936&view=rev
Log:
Don't search for module resources at all if the setting is set to "false". 

Modified:
    lldb/trunk/source/Core/Module.cpp
    lldb/trunk/source/Core/ModuleList.cpp

Modified: lldb/trunk/source/Core/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Module.cpp?rev=215936&r1=215935&r2=215936&view=diff
==============================================================================
--- lldb/trunk/source/Core/Module.cpp (original)
+++ lldb/trunk/source/Core/Module.cpp Mon Aug 18 16:08:44 2014
@@ -1518,6 +1518,9 @@ Module::LoadScriptingResourceInTarget (T
     
     LoadScriptFromSymFile should_load = target->TargetProperties::GetLoadScriptFromSymbolFile();
     
+    if (should_load == eLoadScriptFromSymFileFalse)
+        return false;
+    
     Debugger &debugger = target->GetDebugger();
     const ScriptLanguage script_language = debugger.GetScriptLanguage();
     if (script_language != eScriptLanguageNone)
@@ -1547,8 +1550,6 @@ Module::LoadScriptingResourceInTarget (T
                     FileSpec scripting_fspec (file_specs.GetFileSpecAtIndex(i));
                     if (scripting_fspec && scripting_fspec.Exists())
                     {
-                        if (should_load == eLoadScriptFromSymFileFalse)
-                            return false;
                         if (should_load == eLoadScriptFromSymFileWarn)
                         {
                             if (feedback_stream)

Modified: lldb/trunk/source/Core/ModuleList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ModuleList.cpp?rev=215936&r1=215935&r2=215936&view=diff
==============================================================================
--- lldb/trunk/source/Core/ModuleList.cpp (original)
+++ lldb/trunk/source/Core/ModuleList.cpp Mon Aug 18 16:08:44 2014
@@ -1133,9 +1133,10 @@ ModuleList::LoadScriptingResourcesInTarg
                                                    module->GetFileSpec().GetFileNameStrippingExtension().GetCString(),
                                                    error.AsCString());
                     errors.push_back(error);
+
+                    if (!continue_on_error)
+                        return false;
                 }
-                if (!continue_on_error)
-                    return false;
             }
         }
     }