1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moc: move the static_cast<ObjectType *> to the top of qt_static_metacall

Browse Source 
We need it for the most common operations in this function
(InvokeMetaMethod and all the property operations), so this avoids
duplication and ensures we always compile the static_cast.

Change-Id: I21b199bb5a1a1de632a3fffd45b339c2f3326100
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 69ce741c186c9a1dd4ea9eecb7a51725c4e62342)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-09-10 13:51:57 -07:00 committed by Qt Cherry-pick Bot
parent 30c490da13
commit 83d933ef07
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/tools/moc/generator.cpp
View File

@ -1018,13 +1018,22 @@ void Generator::generateStaticMetacall()
cdef->qualified.constData());
enum UsedArgs {
UsedO = 1,
UsedT = 1,
UsedC = 2,
UsedId = 4,
UsedA = 8,
};
uint usedArgs = 0;
if (cdef->hasQObject) {
#ifndef QT_NO_DEBUG
fprintf(out, " Q_ASSERT(_o == nullptr || staticMetaObject.cast(_o));\n");
#endif
fprintf(out, " auto *_t = static_cast<%s *>(_o);\n", cdef->classname.constData());
} else {
fprintf(out, " auto *_t = reinterpret_cast<%s *>(_o);\n", cdef->classname.constData());
}
const auto generateCtorArguments = [&](int ctorindex) {
const FunctionDef &f = cdef->constructorList.at(ctorindex);
Q_ASSERT(!f.isPrivateSignal); // That would be a strange ctor indeed
@ -1076,17 +1085,8 @@ void Generator::generateStaticMetacall()
methodList += cdef->methodList;
if (!methodList.isEmpty()) {
usedArgs |= UsedO | UsedC | UsedId;
usedArgs |= UsedT | UsedC | UsedId;
fprintf(out, " if (_c == QMetaObject::InvokeMetaMethod) {\n");
if (cdef->hasQObject) {
#ifndef QT_NO_DEBUG
fprintf(out, " Q_ASSERT(staticMetaObject.cast(_o));\n");
#endif
fprintf(out, " auto *_t = static_cast<%s *>(_o);\n", cdef->classname.constData());
} else {
fprintf(out, " auto *_t = reinterpret_cast<%s *>(_o);\n", cdef->classname.constData());
}
fprintf(out, " (void)_t;\n");
fprintf(out, " switch (_id) {\n");
for (int methodindex = 0; methodindex < methodList.size(); ++methodindex) {
const FunctionDef &f = methodList.at(methodindex);
@ -1239,24 +1239,12 @@ void Generator::generateStaticMetacall()
hasBindableProperties |= !p.bind.isEmpty();
}
if (needGet || needSet || hasBindableProperties || needReset)
usedArgs |= UsedO | UsedC | UsedId;
usedArgs |= UsedT | UsedC | UsedId;
if (needGet || needSet || hasBindableProperties)
usedArgs |= UsedA; // resetting doesn't need arguments
auto setupMemberAccess = [this]() {
if (cdef->hasQObject) {
#ifndef QT_NO_DEBUG
fprintf(out, " Q_ASSERT(staticMetaObject.cast(_o));\n");
#endif
fprintf(out, " auto *_t = static_cast<%s *>(_o);\n", cdef->classname.constData());
} else {
fprintf(out, " auto *_t = reinterpret_cast<%s *>(_o);\n", cdef->classname.constData());
}
};
if (needGet) {
fprintf(out, " if (_c == QMetaObject::ReadProperty) {\n");
setupMemberAccess();
if (needTempVarForGet)
fprintf(out, " void *_v = _a[0];\n");
fprintf(out, " switch (_id) {\n");
@ -1295,7 +1283,6 @@ void Generator::generateStaticMetacall()
if (needSet) {
fprintf(out, " if (_c == QMetaObject::WriteProperty) {\n");
setupMemberAccess();
fprintf(out, " void *_v = _a[0];\n");
fprintf(out, " switch (_id) {\n");
for (int propindex = 0; propindex < int(cdef->propertyList.size()); ++propindex) {
@ -1347,7 +1334,6 @@ void Generator::generateStaticMetacall()
if (needReset) {
fprintf(out, "if (_c == QMetaObject::ResetProperty) {\n");
setupMemberAccess();
fprintf(out, " switch (_id) {\n");
for (int propindex = 0; propindex < int(cdef->propertyList.size()); ++propindex) {
const PropertyDef &p = cdef->propertyList.at(propindex);
@ -1367,7 +1353,6 @@ void Generator::generateStaticMetacall()
if (hasBindableProperties) {
fprintf(out, " if (_c == QMetaObject::BindableProperty) {\n");
setupMemberAccess();
fprintf(out, " switch (_id) {\n");
for (int propindex = 0; propindex < int(cdef->propertyList.size()); ++propindex) {
const PropertyDef &p = cdef->propertyList.at(propindex);
@ -1392,7 +1377,7 @@ void Generator::generateStaticMetacall()
if ((usedArgs & entry) == 0)
fprintf(out, " (void)%s;\n", name);
};
printUnused(UsedO, "_o");
printUnused(UsedT, "_t");
printUnused(UsedC, "_c");
printUnused(UsedId, "_id");
printUnused(UsedA, "_a");