use alignas instead of ZEND_SET_ALIGNED() when possible

Sadly we cannot fully remove ZEND_SET_ALIGNED() as alignas is not allowed in typedefs.

Author: Girgias

Zend/zend_string.c

@@ -53,7 +53,7 @@ ZEND_API zend_string  *zend_one_char_string[256];
 ZEND_API zend_string **zend_known_strings = NULL;
 
 /* this is read-only, so it's ok */
-ZEND_SET_ALIGNED(16, static const char zend_hexconvtab[]) = "0123456789abcdef";
+alignas(16) static const char zend_hexconvtab[] = "0123456789abcdef";
 
 static zend_always_inline void zend_bin2hex_impl(char *out, const unsigned char *in, size_t in_len, const char *hexconvtab)
 {

ext/opcache/ZendAccelerator.h

@@ -292,7 +292,7 @@ typedef struct _zend_accel_shared_globals {
 	const void **jit_exit_groups;
 
 	/* Interned Strings Support (must be the last element) */
-	ZEND_SET_ALIGNED(ZEND_STRING_TABLE_POS_ALIGNMENT, zend_string_table interned_strings);
+	alignas(ZEND_STRING_TABLE_POS_ALIGNMENT) zend_string_table interned_strings;
 } zend_accel_shared_globals;
 
 #ifdef ZEND_WIN32

ext/random/random.c

@@ -316,7 +316,7 @@ PHPAPI void *php_random_default_status(void)
 /* }}} */
 
 /* this is read-only, so it's ok */
-ZEND_SET_ALIGNED(16, static const char hexconvtab[]) = "0123456789abcdef";
+alignas(16) static const char hexconvtab[] = "0123456789abcdef";
 
 /* {{{ php_random_bin2hex_le */
 /* stolen from standard/string.c */

ext/standard/crypt_sha256.c

@@ -302,8 +302,8 @@ static const char b64t[64] ZEND_NONSTRING =
 
 char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
 {
-	ZEND_SET_ALIGNED(alignof(uint32_t), unsigned char alt_result[32]);
-	ZEND_SET_ALIGNED(alignof(uint32_t), unsigned char temp_result[32]);
+	alignas(uint32_t) unsigned char alt_result[32];
+	alignas(uint32_t) unsigned char temp_result[32];
 
 	struct sha256_ctx ctx;
 	struct sha256_ctx alt_ctx;

ext/standard/crypt_sha512.c

@@ -341,8 +341,8 @@ static const char b64t[64] ZEND_NONSTRING =
 
 char *
 php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen) {
-	ZEND_SET_ALIGNED(alignof(uint64_t), unsigned char alt_result[64]);
-	ZEND_SET_ALIGNED(alignof(uint64_t), unsigned char temp_result[64]);
+	alignas(uint64_t) unsigned char alt_result[64];
+	alignas(uint64_t) unsigned char temp_result[64];
 	struct sha512_ctx ctx;
 	struct sha512_ctx alt_ctx;
 	size_t salt_len;

ext/standard/string.c

@@ -4076,7 +4076,7 @@ PHPAPI zend_string *php_addslashes(zend_string *str) /* {{{ */
 zend_string *php_addslashes_sse42(zend_string *str)
 # endif
 {
-	ZEND_SET_ALIGNED(16, static const char slashchars[16]) = "\'\"\\\0";
+	alignas(16) static const char slashchars[16] = "\'\"\\\0";
 	__m128i w128, s128;
 	uint32_t res = 0;
 	/* maximum string length, worst case situation */