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

FatalSignalHandler: use std::optional instead of QScopedPointer

Browse Source 
We get stack space reserved instead of using the heap.

Pick-to: 6.3
Change-Id: I5ff8e16fcdcb4ffd9ab6fffd16eb73fff0174150
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Thiago Macieira 2022-05-02 18:27:11 -07:00
parent 3bd1aa09b6
commit 65ff731b62
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/qtestcase.cpp
View File

@ -1935,6 +1935,8 @@ public:
} }
private: private:
Q_DISABLE_COPY_MOVE(FatalSignalHandler)
# ifdef SA_SIGINFO # ifdef SA_SIGINFO
static void signal(int signum, siginfo_t * /* info */, void * /* ucontext */) static void signal(int signum, siginfo_t * /* info */, void * /* ucontext */)
# else # else
@ -2105,10 +2107,10 @@ int QTest::qRun()
} else } else
#endif #endif
{ {
QScopedPointer<FatalSignalHandler> handler; std::optional<FatalSignalHandler> handler;
prepareStackTrace(); prepareStackTrace();
if (!noCrashHandler) if (!noCrashHandler)
handler.reset(new FatalSignalHandler); handler.emplace();
TestMethods::MetaMethods commandLineMethods; TestMethods::MetaMethods commandLineMethods;
commandLineMethods.reserve(static_cast<size_t>(QTest::testFunctions.size())); commandLineMethods.reserve(static_cast<size_t>(QTest::testFunctions.size()));