1 files changed, 19 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4compilationunitmapper.cpp b/src/qml/jsruntime/qv4compilationunitmapper.cpp
index 0479b8b8f1..e9915c7d26 100644
--- a/src/qml/jsruntime/qv4compilationunitmapper.cpp
+++ b/src/qml/jsruntime/qv4compilationunitmapper.cpp
@@ -4,7 +4,6 @@
 #include "qv4compilationunitmapper_p.h"
 
 #include <private/qv4compileddata_p.h>
-#include <private/qv4executablecompilationunit_p.h>
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qmutex.h>
@@ -29,23 +28,24 @@ public:
         s_staticUnits.insert(file, staticUnit);
     }
 
+    void remove(const QString &file)
+    {
+        s_staticUnits.remove(file);
+    }
+
 private:
     QMutexLocker<QMutex> m_lock;
 
     static QMutex s_mutex;
 
-    // We can copy the mappers around because they're all static, that is the dtors are noops.
+    // We can copy the mappers around because they're all static.
+    // We never unmap the files.
     static QHash<QString, CompilationUnitMapper> s_staticUnits;
 };
 
 QHash<QString, CompilationUnitMapper> StaticUnitCache::s_staticUnits;
 QMutex StaticUnitCache::s_mutex;
 
-CompilationUnitMapper::~CompilationUnitMapper()
-{
-    close();
-}
-
 CompiledData::Unit *CompilationUnitMapper::get(
         const QString &cacheFilePath, const QDateTime &sourceTimeStamp, QString *errorString)
 {
@@ -54,7 +54,7 @@ CompiledData::Unit *CompilationUnitMapper::get(
     CompilationUnitMapper mapper = cache.get(cacheFilePath);
     if (mapper.dataPtr) {
         auto *unit = reinterpret_cast<CompiledData::Unit *>(mapper.dataPtr);
-        if (ExecutableCompilationUnit::verifyHeader(unit, sourceTimeStamp, errorString)) {
+        if (unit->verifyHeader(sourceTimeStamp, errorString)) {
             *this = mapper;
             return unit;
         }
@@ -63,10 +63,19 @@ CompiledData::Unit *CompilationUnitMapper::get(
     }
 
     CompiledData::Unit *data = open(cacheFilePath, sourceTimeStamp, errorString);
-    if (data && (data->flags & CompiledData::Unit::StaticData))
+    if (data && (data->flags & CompiledData::Unit::StaticData)) {
         cache.set(cacheFilePath, *this);
+        return data;
+    } else {
+        close();
+        return nullptr;
+    }
+}
 
-    return data;
+void CompilationUnitMapper::invalidate(const QString &cacheFilePath)
+{
+    StaticUnitCache cache;
+    cache.remove(cacheFilePath);
 }
 
 QT_END_NAMESPACE