qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QmlCompiler: Analyze type conversions before reads in basic blocks 

The type conversions happen before the value is read. Therefore, we need
to record them in this order. Otherwise, we may lose a type conversion
if the instruction writes the same register as it reads.

Fixes: QTBUG-102281
Change-Id: Id63a69f86af90c8dc987c0301db3958322c006a1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann 2022-04-05 14:09:17 +02:00
parent a55299615f
commit 8a229c38fb
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qmlcompiler/qqmljsbasicblocks.cpp
View File

@ -296,6 +296,11 @@ void QQmlJSBasicBlocks::populateReaderLocations()
? (writeIt + 1)
: m_annotations.find(currentBlock->first);
for (; blockInstr != blockEnd; ++blockInstr) {
if (registerActive
&& blockInstr->second.typeConversions.contains(writtenRegister)) {
conversions.append(blockInstr.key());
}
for (auto readIt = blockInstr->second.readRegisters.constBegin(),
end = blockInstr->second.readRegisters.constEnd();
readIt != end; ++readIt) {
@ -309,11 +314,6 @@ void QQmlJSBasicBlocks::populateReaderLocations()
access.registerReadersAndConversions[blockInstr.key()] = conversions;
}
if (registerActive
&& blockInstr->second.typeConversions.contains(writtenRegister)) {
conversions.append(blockInstr.key());
}
if (blockInstr->second.changedRegisterIndex == writtenRegister) {
conversions.clear();
registerActive = false;

3
tests/auto/qml/qmlcppcodegen/data/fromBoolValue.qml
View File

@ -4,4 +4,7 @@ import QtQuick 6
Item {
property bool a: !x
width: !(parent && state) ? 100 : 0
property font f
property bool b: !(parent || f)
}

3
tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
View File

@ -2000,13 +2000,16 @@ void tst_QmlCppCodegen::fromBoolValue()
QCOMPARE(o->property("a").toBool(), false);
QCOMPARE(o->property("width").toInt(), 100);
QCOMPARE(o->property("b").toBool(), false);
QScopedPointer<QObject> parent(c.create());
o->setProperty("parent", QVariant::fromValue(parent.data()));
QCOMPARE(o->property("width").toInt(), 100);
QCOMPARE(o->property("b").toBool(), false);
o->setProperty("state", QVariant::fromValue(u"foo"_qs));
QCOMPARE(o->property("width").toInt(), 0);
QCOMPARE(o->property("b").toBool(), false);
}
void tst_QmlCppCodegen::runInterpreted()