From 92a7c360208c6ab7504e8ff9e091fede73839fb1 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 11 Jan 2023 08:30:24 -0800
Subject: [PATCH] QCryptographicHashPrivate: repack, by moving the enum to the
 end
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QCryptographicHashPrivate::SmallByteArray is a 65-byte type, so there
were 7 bytes of padding at the end of QCryptographicHashPrivate anyway.

Pick-to: 6.5
Change-Id: Ide4dbd0777a44ed0870efffd17394e1d5431e052
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/tools/qcryptographichash.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index ef7f43a38c0..39a7e0824a1 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -220,8 +220,6 @@ public:
     QByteArrayView resultView() const noexcept { return result.toByteArrayView(); }
     static bool supportsAlgorithm(QCryptographicHash::Algorithm method);
 
-    const QCryptographicHash::Algorithm method;
-
 #ifdef USING_OPENSSL30
     struct EVP_MD_CTX_deleter {
         void operator()(EVP_MD_CTX *ctx) const noexcept {
@@ -279,6 +277,8 @@ public:
     QBasicMutex finalizeMutex;
     SmallByteArray result;
 
+    const QCryptographicHash::Algorithm method;
+
 #if !defined(QT_CRYPTOGRAPHICHASH_ONLY_SHA1) && !defined(USING_OPENSSL30)
     enum class Sha3Variant
     {