whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMetaObject: improve methodMatch() to include the stored metatypes 

This methodMatch() function needs a rewrite.

Change-Id: I36b24183fbd041179f2ffffd1702278920c54e94
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Thiago Macieira 2022-07-15 17:24:16 -07:00
parent 59065a8530
commit 5643b16684
1 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/corelib/kernel/qmetaobject.cpp
View File

@ -181,6 +181,8 @@ public:
inline uint parameterTypeInfo(int index) const;
inline int parameterType(int index) const;
inline void getParameterTypes(int *types) const;
inline const QtPrivate::QMetaTypeInterface *returnMetaTypeInterface() const;
inline const QtPrivate::QMetaTypeInterface *const *parameterMetaTypeInterfaces() const;
inline QByteArray parameterTypeName(int index) const;
inline QList<QByteArray> parameterTypes() const;
inline QList<QByteArray> parameterNames() const;
@ -593,19 +595,25 @@ bool QMetaObjectPrivate::methodMatch(const QMetaObject *m, const QMetaMethod &me
const QArgumentType *types)
{
const QMetaMethod::Data &data = method.data;
if (data.argc() != uint(argc))
auto priv = QMetaMethodPrivate::get(&method);
if (priv->parameterCount() != argc)
return false;
if (stringData(m, data.name()) != name)
return false;
const QtPrivate::QMetaTypeInterface * const *ifaces = priv->parameterMetaTypeInterfaces();
int paramsIndex = data.parameters() + 1;
for (int i = 0; i < argc; ++i) {
uint typeInfo = m->d.data[paramsIndex + i];
if (types[i].type()) {
if (types[i].type() != typeFromTypeInfo(m, typeInfo))
if (int id = types[i].type()) {
if (id == QMetaType(ifaces[i]).id())
continue;
if (id != typeFromTypeInfo(m, typeInfo))
return false;
} else {
if (types[i].name() == QMetaType(ifaces[i]).name())
continue;
if (types[i].name() != typeNameFromTypeInfo(m, typeInfo))
return false;
}
@ -1800,6 +1808,21 @@ int QMetaMethodPrivate::parameterCount() const
return data.argc();
}
static inline void
checkMethodMetaTypeConsistency(const QtPrivate::QMetaTypeInterface *iface, uint typeInfo)
{
QMetaType mt(iface);
if (iface) {
if ((typeInfo & IsUnresolvedType) == 0)
Q_ASSERT(mt.id() == int(typeInfo & TypeNameIndexMask));
Q_ASSERT(mt.name());
} else {
// prior to Qt 6.5, the meta object did not record interfaces for void
// (obviously only the return type may be void)
Q_ASSERT(typeInfo & IsUnresolvedType || typeInfo == QMetaType::Void);
}
}
int QMetaMethodPrivate::parametersDataIndex() const
{
Q_ASSERT(priv(mobj->d.data)->revision >= 7);
@ -1812,6 +1835,29 @@ uint QMetaMethodPrivate::parameterTypeInfo(int index) const
return mobj->d.data[parametersDataIndex() + index];
}
const QtPrivate::QMetaTypeInterface *QMetaMethodPrivate::returnMetaTypeInterface() const
{
Q_ASSERT(priv(mobj->d.data)->revision >= 7);
if (methodType() == QMetaMethod::Constructor)
return nullptr; // constructors don't have return types
const QtPrivate::QMetaTypeInterface *iface = mobj->d.metaTypes[data.metaTypeOffset()];
checkMethodMetaTypeConsistency(iface, parameterTypeInfo(-1));
return iface;
}
const QtPrivate::QMetaTypeInterface * const *QMetaMethodPrivate::parameterMetaTypeInterfaces() const
{
Q_ASSERT(priv(mobj->d.data)->revision >= 7);
int offset = (methodType() == QMetaMethod::Constructor ? 0 : 1);
const auto ifaces = &mobj->d.metaTypes[data.metaTypeOffset() + offset];
for (int i = 0; i < parameterCount(); ++i)
checkMethodMetaTypeConsistency(ifaces[i], parameterTypeInfo(i));
return ifaces;
}
int QMetaMethodPrivate::parameterType(int index) const
{
Q_ASSERT(priv(mobj->d.data)->revision >= 7);