better fix for #48409 , #48428 , #48228

arnaud-lb · arnaud-lb · commit 07f2ac9f0aa8 · 2009-06-01T15:07:27.000Z
diff --git a/Zend/zend.h b/Zend/zend.h
@@ -193,6 +193,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
@@ -81,15 +81,15 @@ 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);
 	*c = *(--stack->top_element);
 	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
@@ -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
@@ -2362,9 +2362,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) {
@@ -4490,8 +4488,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
@@ -298,9 +298,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) {
@@ -646,8 +644,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++) {

Original file line number	Diff line number	Diff line change
`@@ -81,15 +81,15 @@ static inline void zend_ptr_stack_2_push(zend_ptr_stack stack, void a, void *b`
`81`	`81`	`#undef ZEND_PTR_STACK_NUM_ARGS`
`82`	`82`	`}`
`83`	`83`
`84`		`-static inline void zend_ptr_stack_3_pop(zend_ptr_stack stack, void a, void b, void *c)`
	`84`	`+static inline void zend_ptr_stack_3_pop(zend_ptr_stack stack, zend_alias restrict a, zend_alias restrict b, zend_alias restrict c)`
`85`	`85`	`{`
`86`	`86`	`a = (--stack->top_element);`
`87`	`87`	`b = (--stack->top_element);`
`88`	`88`	`c = (--stack->top_element);`
`89`	`89`	`stack->top -= 3;`
`90`	`90`	`}`
`91`	`91`
`92`		`-static inline void zend_ptr_stack_2_pop(zend_ptr_stack stack, void a, void *b)`
	`92`	`+static inline void zend_ptr_stack_2_pop(zend_ptr_stack stack, zend_alias restrict a, zend_alias *restrict b)`
`93`	`93`	`{`
`94`	`94`	`a = (--stack->top_element);`
`95`	`95`	`b = (--stack->top_element);`
Original file line number	Diff line number	Diff line change
`@@ -2362,9 +2362,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)`
`2362`	`2362`	`EG(called_scope) = EX(called_scope);`
`2363`	`2363`	`}`
`2364`	`2364`
`2365`		`- EX(called_scope) = zend_ptr_stack_pop(&EG(arg_types_stack));`
`2366`		`- EX(current_object) = zend_ptr_stack_pop(&EG(arg_types_stack));`
`2367`		`- EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));`
	`2365`	`+ zend_ptr_stack_3_pop(&EG(arg_types_stack), (zend_alias)&EX(called_scope), (zend_alias)&EX(current_object), (zend_alias*)&EX(fbc));`
`2368`	`2366`	`EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);`
`2369`	`2367`
`2370`	`2368`	`if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {`
`@@ -4490,8 +4488,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)`
`4490`	`4488`	`zval_ptr_dtor(&EX(object));`
`4491`	`4489`	`}`
`4492`	`4490`	`EX(called_scope) = DECODE_CTOR(EX(called_scope));`
`4493`		`- EX(object) = zend_ptr_stack_pop(&EG(arg_types_stack));`
`4494`		`- EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));`
	`4491`	`+ zend_ptr_stack_2_pop(&EG(arg_types_stack), (zend_alias)&EX(object), (zend_alias)&EX(fbc));`
`4495`	`4492`	`}`
`4496`	`4493`
`4497`	`4494`	`for (i=0; i<EX(op_array)->last_brk_cont; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -298,9 +298,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR`
`298`	`298`	`EG(called_scope) = EX(called_scope);`
`299`	`299`	`}`
`300`	`300`
`301`		`- EX(called_scope) = zend_ptr_stack_pop(&EG(arg_types_stack));`
`302`		`- EX(current_object) = zend_ptr_stack_pop(&EG(arg_types_stack));`
`303`		`- EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));`
	`301`	`+ zend_ptr_stack_3_pop(&EG(arg_types_stack), (zend_alias)&EX(called_scope), (zend_alias)&EX(current_object), (zend_alias*)&EX(fbc));`
`304`	`302`	`EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);`
`305`	`303`
`306`	`304`	`if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {`
`@@ -646,8 +644,7 @@ static int ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER`
`646`	`644`	`zval_ptr_dtor(&EX(object));`
`647`	`645`	`}`
`648`	`646`	`EX(called_scope) = DECODE_CTOR(EX(called_scope));`
`649`		`- EX(object) = zend_ptr_stack_pop(&EG(arg_types_stack));`
`650`		`- EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));`
	`647`	`+ zend_ptr_stack_2_pop(&EG(arg_types_stack), (zend_alias)&EX(object), (zend_alias)&EX(fbc));`
`651`	`648`	`}`
`652`	`649`
`653`	`650`	`for (i=0; i<EX(op_array)->last_brk_cont; i++) {`