QVariant: make typeId() & userType() bypass the unnecessary registrationHEADdev

QVariant already registers any type it gets, so we don't need
QMetaType::id() to attempt to register again. Saves a bit of code
wherever it gets used.

Pick-to: 6.10
Change-Id: I91f5792eb04fdf263142fffd44f8257041afdd0e
Reviewed-by: Fabian Kosmale <[email protected]>

1 files changed, 10 insertions, 1 deletions

diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 31f5869c9d9..e9d3ffb9ae3 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -332,7 +332,16 @@ public:
     inline void swap(QVariant &other) noexcept { std::swap(d, other.d); }
 
     int userType() const { return typeId(); }
-    int typeId() const { return metaType().id(); }
+    int typeId() const
+    {
+        // QVariant types are always registered (see fromMetaType())
+        const QtPrivate::QMetaTypeInterface *mt = metaType().iface();
+        if (!mt)
+            return 0;
+        int id = mt->typeId.loadRelaxed();
+        // Q_ASSUME(id > 0);
+        return id;
+    }
 
     const char *typeName() const;
     QMetaType metaType() const;