Move scratchpad type definition to evmc_result

Author: chfast

include/evmc/evmc.h

@@ -331,24 +331,6 @@ struct evmc_result;
  */
 typedef void (*evmc_release_result_fn)(const struct evmc_result* result);
 
-union evmc_result_scratchpad
-{
-
-    /**
-     * Reserved data that MAY be used by a evmc_result object creator.
-     *
-     *  This reserved 4 bytes together with 20 bytes from create_address form
-     *  24 bytes of memory called "optional data" within evmc_result struct
-     *  to be optionally used by the evmc_result object creator.
-     *
-     *  @see evmc_result_optional_data, evmc_get_optional_data().
-     *
-     *  Also extends the size of the evmc_result to 64 bytes (full cache line).
-     */
-    uint8_t bytes[64];
-
-    void* pointer;
-};
 
 /** The EVM code execution result. */
 struct evmc_result
@@ -416,7 +398,23 @@ struct evmc_result
      */
     evmc_address create_address;
 
-    union evmc_result_scratchpad scratchpad;
+    union scratchpad
+    {
+        /**
+         * Reserved data that MAY be used by a evmc_result object creator.
+         *
+         *  This reserved 4 bytes together with 20 bytes from create_address form
+         *  24 bytes of memory called "optional data" within evmc_result struct
+         *  to be optionally used by the evmc_result object creator.
+         *
+         *  @see evmc_result_optional_data, evmc_get_optional_data().
+         *
+         *  Also extends the size of the evmc_result to 64 bytes (full cache line).
+         */
+        uint8_t bytes[32];
+
+        void* pointer;
+    } scratchpad;
 };
 
 

test/unittests/test_helpers.cpp

@@ -22,7 +22,7 @@ static_assert(sizeof(evmc_call_kind) == sizeof(int),
 static_assert(sizeof(evmc_revision) == sizeof(int), "Enum `evmc_revision` is not the size of int");
 
 
-static_assert(offsetof(evmc_result, scratchpad) % alignof(void*) == 0,
+static_assert(offsetof(evmc_result, scratchpad) % 8 == 0,
               "evmc_result's scratchpad not properly aligned");
 
 TEST(helpers, release_result)