MFH: better fix for #48409 , #48428 , #48228

diff --git a/Zend/zend.h b/Zend/zend.h
index ed7cc789048e353c08bf82235ba970c04d2ec92d..935e113241db239c4bc318e71924c8a76b96c4dc 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -192,6 +192,12 @@ char *alloca ();
 # define ZEND_FASTCALL
 #endif
 
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400
+#else
+# define __restrict__
+#endif
+#define restrict __restrict__
+
 #if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
 # define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
 # define ALLOCA_FLAG(name) \

diff --git a/Zend/zend_ptr_stack.h b/Zend/zend_ptr_stack.h
index f20e3d91e85ab6c2be98ada974db472a1f1c0118..fb613b88c732cec7e6fecd120991954bd927d2ca 100644 (file)
--- a/Zend/zend_ptr_stack.h
+++ b/Zend/zend_ptr_stack.h
@@ -81,7 +81,7 @@ static inline void zend_ptr_stack_2_push(zend_ptr_stack *stack, void *a, void *b
 #undef ZEND_PTR_STACK_NUM_ARGS
 }
 
-static inline void zend_ptr_stack_3_pop(zend_ptr_stack *stack, void **a, void **b, void **c)
+static inline void zend_ptr_stack_3_pop(zend_ptr_stack *stack, zend_alias *restrict a, zend_alias *restrict b, zend_alias *restrict c)
 {
        *a = *(--stack->top_element);
        *b = *(--stack->top_element);
@@ -89,7 +89,7 @@ static inline void zend_ptr_stack_3_pop(zend_ptr_stack *stack, void **a, void **
        stack->top -= 3;
 }
 
-static inline void zend_ptr_stack_2_pop(zend_ptr_stack *stack, void **a, void **b)
+static inline void zend_ptr_stack_2_pop(zend_ptr_stack *stack, zend_alias *restrict a, zend_alias *restrict b)
 {
        *a = *(--stack->top_element);
        *b = *(--stack->top_element);

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index 124adf4adfa0c19f9bbbea26af7919087799311d..e3d765529c88f91b09314bd04c7d16888e88f9ce 100644 (file)
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -50,6 +50,12 @@ typedef long zend_intptr_t;
 typedef unsigned long zend_uintptr_t;
 #endif
 
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400
+typedef void* __attribute__((__may_alias__)) zend_alias;
+#else
+typedef void* zend_alias;
+#endif
+
 typedef unsigned int zend_object_handle;
 typedef struct _zend_object_handlers zend_object_handlers;
 

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 182e6498546832e9cdf0bf4a59c04aaa47436f78..a4ea1b6d7a8ab7fe8adc4df4b205841dfecee0ab 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2288,9 +2288,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
                EG(called_scope) = EX(called_scope);
        }
 
-       EX(called_scope) = zend_ptr_stack_pop(&EG(arg_types_stack));
-       EX(current_object) = zend_ptr_stack_pop(&EG(arg_types_stack));
-       EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
+       zend_ptr_stack_3_pop(&EG(arg_types_stack), (zend_alias*)&EX(called_scope), (zend_alias*)&EX(current_object), (zend_alias*)&EX(fbc));
        EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
 
        if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
@@ -4298,8 +4296,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
                        zval_ptr_dtor(&EX(object));
                }
                EX(called_scope) = DECODE_CTOR(EX(called_scope));
-               EX(object) = zend_ptr_stack_pop(&EG(arg_types_stack));
-               EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
+               zend_ptr_stack_2_pop(&EG(arg_types_stack), (zend_alias*)&EX(object), (zend_alias*)&EX(fbc));
        }
 
        for (i=0; i<EX(op_array)->last_brk_cont; i++) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index b69e681c083968bc86edbaf1c0fca98fbf9ce923..bf84924dfce412d856edbe1d198524b74fbc1139 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -290,9 +290,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
                EG(called_scope) = EX(called_scope);
        }
 
-       EX(called_scope) = zend_ptr_stack_pop(&EG(arg_types_stack));
-       EX(current_object) = zend_ptr_stack_pop(&EG(arg_types_stack));
-       EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
+       zend_ptr_stack_3_pop(&EG(arg_types_stack), (zend_alias*)&EX(called_scope), (zend_alias*)&EX(current_object), (zend_alias*)&EX(fbc));
        EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
 
        if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
@@ -638,8 +636,7 @@ static int ZEND_FASTCALL  ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER
                        zval_ptr_dtor(&EX(object));
                }
                EX(called_scope) = DECODE_CTOR(EX(called_scope));
-               EX(object) = zend_ptr_stack_pop(&EG(arg_types_stack));
-               EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
+               zend_ptr_stack_2_pop(&EG(arg_types_stack), (zend_alias*)&EX(object), (zend_alias*)&EX(fbc));
        }
 
        for (i=0; i<EX(op_array)->last_brk_cont; i++) {