1 files changed, 25 insertions, 40 deletions

diff --git a/src/qml/compiler/qv4compilercontext_p.h b/src/qml/compiler/qv4compilercontext_p.h
index f67bee6dea..ceb5d00a0b 100644
--- a/src/qml/compiler/qv4compilercontext_p.h
+++ b/src/qml/compiler/qv4compilercontext_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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) 2017 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
 #ifndef QV4COMPILERCONTEXT_P_H
 #define QV4COMPILERCONTEXT_P_H
 
@@ -56,6 +20,11 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QStack>
 #include <QtCore/QHash>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
+#include <QtCore/QVarLengthArray>
+
+#include <memory>
 
 QT_BEGIN_NAMESPACE
 
@@ -177,6 +146,16 @@ struct Context {
         FunctionDefinition
     };
 
+    struct SourceLocationTable
+    {
+        struct Entry
+        {
+            quint32 offset;
+            QQmlJS::SourceLocation location;
+        };
+        QVector<Entry> entries;
+    };
+
     struct Member {
         MemberType type = UndefinedMember;
         int index = -1;
@@ -195,7 +174,7 @@ struct Context {
     QSet<QString> usedVariables;
     QQmlJS::AST::FormalParameterList *formals = nullptr;
     QQmlJS::AST::BoundNames arguments;
-    QString returnType;
+    QQmlJS::AST::Type *returnType = nullptr;
     QStringList locals;
     QStringList moduleRequests;
     QVector<ImportEntry> importEntries;
@@ -205,7 +184,8 @@ struct Context {
 
     ControlFlow *controlFlow = nullptr;
     QByteArray code;
-    QVector<CompiledData::CodeOffsetToLine> lineNumberMapping;
+    QVector<CompiledData::CodeOffsetToLineAndStatement> lineAndStatementNumberMapping;
+    std::unique_ptr<SourceLocationTable> sourceLocationTable;
     std::vector<unsigned> labelInfo;
 
     int nRegisters = 0;
@@ -380,6 +360,11 @@ struct Context {
             return parent->canHaveTailCalls();
         return false;
     }
+
+    bool isCaseBlock() const
+    {
+        return contextType == ContextType::Block && name == u"%CaseBlock";
+    }
 };