1 files changed, 21 insertions, 48 deletions

diff --git a/src/qml/jsruntime/qv4compilationunitmapper.cpp b/src/qml/jsruntime/qv4compilationunitmapper.cpp
index f3e2b445d1..e9915c7d26 100644
--- a/src/qml/jsruntime/qv4compilationunitmapper.cpp
+++ b/src/qml/jsruntime/qv4compilationunitmapper.cpp
@@ -1,46 +1,9 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qv4compilationunitmapper_p.h"
 
 #include <private/qv4compileddata_p.h>
-#include <private/qv4executablecompilationunit_p.h>
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qmutex.h>
@@ -65,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)
 {
@@ -90,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;
         }
@@ -99,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