Macrify the common operation

Author: weltling

Zend/zend_portability.h

@@ -540,6 +540,9 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */
 # define ZEND_SET_ALIGNED(alignment, decl) decl
 #endif
 
+#define ZEND_SLIDE_TO_ALIGNED(alignment, ptr) (((zend_uintptr_t)(ptr) + ((alignment)-1)) & ~((alignment)-1))
+#define ZEND_SLIDE_TO_ALIGNED16(ptr) ZEND_SLIDE_TO_ALIGNED(Z_UL(16), ptr)
+
 #endif /* ZEND_PORTABILITY_H */
 
 /*

ext/standard/string.c

@@ -3922,7 +3922,7 @@ zend_string *php_addslashes_sse42(zend_string *str, int should_free)
 	end = source + ZSTR_LEN(str);
 
 	if (ZSTR_LEN(str) > 15) {
-		char *aligned = (char*)(((zend_uintptr_t)source + 15) & ~15);
+		char *aligned = (char*) ZEND_SLIDE_TO_ALIGNED16(source);
 
 		if (UNEXPECTED(source != aligned)) {
 			do {
@@ -3997,7 +3997,7 @@ zend_string *php_addslashes_sse42(zend_string *str, int should_free)
 		}
 		source += 16;
 	} else if (end - source > 15) {
-		char *aligned = (char*)(((zend_uintptr_t)source + 15) & ~15);
+		char *aligned = (char*) ZEND_SLIDE_TO_ALIGNED16(source);
 
 		if (source != aligned) {
 			do {