summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/tools
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-09-11 19:44:38 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2023-09-12 21:12:50 +0000
commit6da6a17de9ccfcd5458ea72507b131660e0ab948 (patch)
treeec9e733c460d6d53aa09bbfbf72ba98fdadefac7 /tests/auto/corelib/tools
parent5503b478935aee563d31c5df035803818f4cead3 (diff)
Fix qHash(qfloat16) to match Qt 6.4 behavior
There were two problems: - On platforms where QFLOAT16_IS_NATIVE == true, a qHash(qfloat16{}) call has become ambiguous between the three FP qHash() overloads (float, double, long double), where it was unambiguously calling the float one in Qt 6.4. This SiC was caused by the replacement of operator float() by operator __fp16() in 99c7f0419e66692260be56c0385badeacb3f6760, which is in Qt 6.5. - On platforms where QFLOAT16_IS_NATIVE == false, qHash(qfloat16{}) would produce a different value from qHash(float{}), and therefore Qt 6.4, when the seed was != 0, because the former would go via the one-arg-to-two-arg qHash adapter while the latter one would not. Since participating functions are inline, this causes old and new code to produce different hash values for the same qfloat16, leading to a BiC possibly corrupting QHash etc. Fix both by adding an explicit qHash(qfloat16). This function is inline, so it doesn't add a new symbol to 6.5.x. [ChangeLog][QtCore] Fixed qHash(qfloat16) which was broken from 6.5.0 to 6.5.3, inclusive. If you compiled against one of the affected Qt versions, you need to recompile against either Qt 6.4 or earlier or 6.5.4 or later, because the problematic code is inline. Pick-to: 6.6 6.5 Fixes: QTBUG-116064 Fixes: QTBUG-116076 Change-Id: Id02bc29a6c3ec463352f4bef314c040369081e9b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/tools')
-rw-r--r--tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
index 69e401ae66..8618a03d14 100644
--- a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
+++ b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
@@ -107,16 +107,10 @@ void tst_QHashFunctions::consistent()
// floats
{
const/*expr broken: QTBUG-116079*/ qfloat16 f16 = -42.f;
-#if !QFLOAT16_IS_NATIVE // QTBUG-116064
const auto h16 = qHash(f16, seed);
-#endif
const auto h32 = qHash(float(f16), seed);
const auto h64 = qHash(double(f16), seed);
-#if !QFLOAT16_IS_NATIVE // QTBUG-116064
- if (seed != 0)
- QEXPECT_FAIL("", "QTBUG-116076", Continue);
QCOMPARE(h16, h32);
-#endif
QEXPECT_FAIL("", "QTBUG-116077", Continue);
QCOMPARE(h32, h64);
}