qt/qtdeclarative.git/src/qmlcompiler/qqmljsbasicblocks.cpp, branch 6.5 Qt Declarative (Quick 2) Merge tag 'v6.5.10-lts' into tqtc/lts-6.5-opensource 2026-08-20T12:41:16+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2026-08-20T12:41:16+00:00 ae5bbc665633ea99eb26800eb5a8978d2213a2c2 Qt 6.5.10-lts release Conflicts solved: dependencies.yaml Change-Id: I30aa1cd656455861044ba1c3c8075f52d20dc2e8 
Qt 6.5.10-lts release

Conflicts solved:
	dependencies.yaml

Change-Id: I30aa1cd656455861044ba1c3c8075f52d20dc2e8
QmlCompiler: Discern between different kinds of side effects 2025-07-01T07:52:07+00:00 Ulf Hermann ulf.hermann@qt.io 2025-06-20T11:17:31+00:00 81e8b11adc71205d3c1f19ea86c3ce8afdecb53f A mere jump does not cause all value types and lists to be invalidated. Only calls to other functions or writes to other properties do that. Fixes: QTBUG-137540 Change-Id: I069c6873455c51bbea59cf876d2bc7ecd188f81b Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> (cherry picked from commit 6b14ba5c2fbc2810bb62a87008e338cca571acf6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit bb98127e33046af10d7a4437239fdf03de5f2ea8) (cherry picked from commit ca8b14febb685df22a259f46a8ff60db597da946) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 564d2eb26c6c938dcd3ab94209cd0b96abdabe80) 
A mere jump does not cause all value types and lists to be invalidated.
Only calls to other functions or writes to other properties do that.

Fixes: QTBUG-137540
Change-Id: I069c6873455c51bbea59cf876d2bc7ecd188f81b
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
(cherry picked from commit 6b14ba5c2fbc2810bb62a87008e338cca571acf6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit bb98127e33046af10d7a4437239fdf03de5f2ea8)
(cherry picked from commit ca8b14febb685df22a259f46a8ff60db597da946)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 564d2eb26c6c938dcd3ab94209cd0b96abdabe80)
Revert "Update commercial SPDX-License-Identifier" 2025-06-02T06:01:16+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2025-05-30T09:58:32+00:00 ab97288de27970ba3cb0300158df757c01dabd77 This reverts commit 6517e8df24d2381e951b9ec3e0cda2ae33edac37. Commercial SPDX license identifiers need to be removed from the opensource release. Change-Id: I60f8c76ace400db6182e012c8aae050d13d262e9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> 
This reverts commit 6517e8df24d2381e951b9ec3e0cda2ae33edac37.

Commercial SPDX license identifiers need to be removed from
the opensource release.

Change-Id: I60f8c76ace400db6182e012c8aae050d13d262e9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
QmlCompiler: Use a hash set for the list of conversions 2024-01-22T10:23:36+00:00 Ulf Hermann ulf.hermann@qt.io 2024-01-18T09:04:17+00:00 1245fb8cad50a79e53c5c95380c6bf5809c3e973 There can be a lot of them and we don't want quadratic behavior. It might be possible to further improve on this using e.g. sorted lists and algorithms provided by the STL. However, such an implementation would be more complicated and would require weighing several trade-offs. Fixes: QTBUG-121139 Change-Id: I717b49bd4af97abcaae9ae78d1e1b31d5d462952 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit af212e5e4edb73978298cd030b15deb8d8c28183) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2108e416eabc68c0136faa5041d80866ce1da716) (cherry picked from commit 2c460deadc08da2a43da7fc2b96452477c74fafd) 
There can be a lot of them and we don't want quadratic behavior. It might be possible to further improve on this using e.g. sorted lists
and algorithms provided by the STL. However, such an implementation
would be more complicated and would require weighing several trade-offs.

Fixes: QTBUG-121139
Change-Id: I717b49bd4af97abcaae9ae78d1e1b31d5d462952
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit af212e5e4edb73978298cd030b15deb8d8c28183)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2108e416eabc68c0136faa5041d80866ce1da716)
(cherry picked from commit 2c460deadc08da2a43da7fc2b96452477c74fafd)
QmlCompiler: Do not adjust renames 2023-12-18T15:06:25+00:00 Ulf Hermann ulf.hermann@qt.io 2023-12-06T15:22:22+00:00 4641284889eabcf3b639e016259ec90afceb9dcf A rename always produces a register with exactly one tracked type, but we do not want to use it as base for the type adjustments. We want to adjust based on the original location and its readers (which includes any renames). Change-Id: Iaefdf56992c7c101a35a056fb93c49ade5ccf393 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> (cherry picked from commit 9f8193b65b0302854068b69bc1c9a46de2eb0a36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9b89a021c3d146576c063928199ba7ba45645512) 
A rename always produces a register with exactly one tracked type, but
we do not want to use it as base for the type adjustments. We want to
adjust based on the original location and its readers (which includes
any renames).

Change-Id: Iaefdf56992c7c101a35a056fb93c49ade5ccf393
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
(cherry picked from commit 9f8193b65b0302854068b69bc1c9a46de2eb0a36)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9b89a021c3d146576c063928199ba7ba45645512)
Update commercial SPDX-License-Identifier 2023-12-13T16:58:36+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2023-12-08T15:16:30+00:00 6517e8df24d2381e951b9ec3e0cda2ae33edac37 Some files in tqtc-qtdeclarative were missing the commercial SPDX-License-Identifier. Build files, examples, tests, or documentation are not updated. Task-number: QTQAINFRA-5900 Change-Id: I2cad9a7a271b0b3f3af3074259614b890b266a91 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 132fe2df41fc5e69fec39440b35137d5f0d63f6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Some files in tqtc-qtdeclarative were missing the commercial
SPDX-License-Identifier. Build files, examples, tests, or
documentation are not updated.

Task-number: QTQAINFRA-5900
Change-Id: I2cad9a7a271b0b3f3af3074259614b890b266a91
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 132fe2df41fc5e69fec39440b35137d5f0d63f6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
QmlCompiler: Properly reset before re-running basic blocks pass 2023-06-22T06:50:02+00:00 Ulf Hermann ulf.hermann@qt.io 2023-06-21T07:19:16+00:00 bb08f1e5afc1916ec4f884627e36c2a221d5f9a5 If we were within dead code at the end of the previous run we need to reset the "skip until next label" flag. Otherwise we still assume we're in dead code at the beginning of the function, with interesting effects. Fixes: QTBUG-114476 Change-Id: Ib6e3d6c81aad4c8aaac12accdb3936e4136235fc Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit dae48cf190c282ef65df94ef7148a93cf3306e2d) 
If we were within dead code at the end of the previous run we need to
reset the "skip until next label" flag. Otherwise we still assume we're
in dead code at the beginning of the function, with interesting effects.

Fixes: QTBUG-114476
Change-Id: Ib6e3d6c81aad4c8aaac12accdb3936e4136235fc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit dae48cf190c282ef65df94ef7148a93cf3306e2d)
QmlCompiler: Disallow reading from values affected by side effects 2023-05-05T11:51:51+00:00 Ulf Hermann ulf.hermann@qt.io 2023-04-28T12:02:20+00:00 a401d523fb514e88e29062c50c56b1adb369e71f Instead of accepting the inconsistency between interpreter and compiled code here, we can just detect whether a value can be affected by side effects and refrain from reading it then. Since you can always explicitly reload a value that may have been changed, the resulting compile warnings are easily worked around in user code. Refactoring user code this way also makes it much clearer what is actually going on. Task-number: QTBUG-109221 Change-Id: Ica832e39838ef732b0d181364630737fd7709b74 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 4634b6bf54e5ba15aa2e8efc12feb156e3d9c309) 
Instead of accepting the inconsistency between interpreter and compiled
code here, we can just detect whether a value can be affected by side
effects and refrain from reading it then. Since you can always
explicitly reload a value that may have been changed, the resulting
compile warnings are easily worked around in user code. Refactoring user
code this way also makes it much clearer what is actually going on.

Task-number: QTBUG-109221
Change-Id: Ica832e39838ef732b0d181364630737fd7709b74
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 4634b6bf54e5ba15aa2e8efc12feb156e3d9c309)
qmlcompiler: Deduplicate instructionManipulatesContext() 2023-02-08T07:10:49+00:00 Ulf Hermann ulf.hermann@qt.io 2023-02-07T08:52:14+00:00 b6e10a0415551fc7fdb9e1bcb7af8e13ae865001 We use it in three different compile passes, so it should be a member of QQmlJSCompilePass. Change-Id: Ibc46ceb7ab05839b0a573c8ab3ee2acf4a6de154 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 26f84f5e5856158bf85d04f00aecbaa4943cf544) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
We use it in three different compile passes, so it should be a member of
QQmlJSCompilePass.

Change-Id: Ibc46ceb7ab05839b0a573c8ab3ee2acf4a6de154
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 26f84f5e5856158bf85d04f00aecbaa4943cf544)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Port from qAsConst() to std::as_const() 2022-10-07T21:38:56+00:00 Marc Mutz marc.mutz@qt.io 2022-10-06T09:30:50+00:00 c2d490a2385ea6f389340a296acaac0fa198c8b9 We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I601bf70f020f511019ed28731ba53b14b765dbf0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.

Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.

Task-number: QTBUG-99313
Change-Id: I601bf70f020f511019ed28731ba53b14b765dbf0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>