diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-11-16 15:45:14 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-11-26 11:57:52 +0100 |
| commit | cb3ec010fff39a9b5b35b1afb3af478cf118c3ca (patch) | |
| tree | 4934ef3eb31bcc8f5806e7b1be06e7508b7948e3 /src/qmlcompiler/qqmljsstoragegeneralizer.cpp | |
| parent | ab4a4be2ed10fbb04015da01811d9be6b003ec17 (diff) | |
QmlCompiler: Move type generalization into separate compile pass
We want to be able to skip it.
Task-number: QTBUG-98305
Change-Id: Ibb0293d348f2828a28be4c458cf955b4cc706caa
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljsstoragegeneralizer.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljsstoragegeneralizer.cpp | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/src/qmlcompiler/qqmljsstoragegeneralizer.cpp b/src/qmlcompiler/qqmljsstoragegeneralizer.cpp new file mode 100644 index 0000000000..2b0938c96f --- /dev/null +++ b/src/qmlcompiler/qqmljsstoragegeneralizer.cpp @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qqmljsstoragegeneralizer_p.h" + +QT_BEGIN_NAMESPACE + +QQmlJSCompilePass::InstructionAnnotations QQmlJSStorageGeneralizer::run( + InstructionAnnotations annotations, Function *function, + QQmlJS::DiagnosticMessage *error) +{ + m_error = error; + + if (QQmlJSScope::ConstPtr &returnType = function->returnType) { + if (QQmlJSScope::ConstPtr stored = m_typeResolver->genericType( + returnType, QQmlJSTypeResolver::ComponentIsGeneric::Yes)) { + returnType = stored; + } else { + setError(QStringLiteral("Cannot store the return type %1.") + .arg(returnType->internalName(), 0)); + return InstructionAnnotations(); + } + } + + for (QQmlJSScope::ConstPtr &argument : function->argumentTypes) { + Q_ASSERT(argument); + if (QQmlJSScope::ConstPtr stored = m_typeResolver->genericType( + argument, QQmlJSTypeResolver::ComponentIsGeneric::Yes)) { + argument = std::move(stored); + } else { + setError(QStringLiteral("Cannot store the argument type %1.") + .arg(argument->internalName(), 0)); + return InstructionAnnotations(); + } + } + + const auto transformRegisters = [&](QHash<int, QQmlJSRegisterContent> ®isters, int offset) { + for (auto j = registers.begin(), jEnd = registers.end(); j != jEnd; ++j) { + const QQmlJSRegisterContent &content = *j; + if (QQmlJSScope::ConstPtr specific = content.storedType()) { + if (QQmlJSScope::ConstPtr generic = m_typeResolver->genericType(specific)) { + *j = content.storedIn(generic); + } else { + setError(QStringLiteral("Cannot store the register type %1.") + .arg(specific->internalName()), offset); + return false; + } + } + } + return true; + }; + + for (auto i = annotations.begin(), iEnd = annotations.end(); i != iEnd; ++i) { + if (!transformRegisters(i->registers, i.key())) + return InstructionAnnotations(); + if (!transformRegisters(i->expectedTargetTypesBeforeJump, i.key())) + return InstructionAnnotations(); + } + + return annotations; +} + +QT_END_NAMESPACE |