ModuleLoader: Do not cache Probes that throw errors

Doing so can hide errors, for instance when such a Probe is first run by
a non-required module instance.

Task-number: QBS-1074
Change-Id: Ibfbba029761b7d09d0a02eeaf5aa01f76c701574
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index babd727be..233fa7074 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -2188,18 +2188,18 @@ void ModuleLoader::resolveProbe(ProductContext *productContext, Item *parent, It
         if (!resolvedProbe)
             properties.insert(b.first, newValue);
     }
-    if (!resolvedProbe) {
-        resolvedProbe = Probe::create(probe->location(), condition,
-                configureScript->sourceCode().toString(), properties, initialProperties);
-        m_currentProbes[probe->location()] << resolvedProbe;
-    }
-    productContext->info.probes << resolvedProbe;
     m_engine->currentContext()->popScope();
     m_engine->currentContext()->popScope();
     m_engine->currentContext()->popScope();
     m_engine->currentContext()->popScope();
     if (evalError.hasError())
         throw evalError;
+    if (!resolvedProbe) {
+        resolvedProbe = Probe::create(probe->location(), condition,
+                configureScript->sourceCode().toString(), properties, initialProperties);
+        m_currentProbes[probe->location()] << resolvedProbe;
+    }
+    productContext->info.probes << resolvedProbe;
 }
 
 void ModuleLoader::checkCancelation() const