View | Details | Raw Unified | Return to bug 227723
Collapse All | Expand All

(-)lang/php56/files/patch-Zend_zend__compile.h (+12 lines)
Line 0 Link Here
1
--- Zend/zend_compile.h.orig	2018-02-27 23:15:25 UTC
2
+++ Zend/zend_compile.h
3
@@ -414,9 +414,6 @@ struct _zend_execute_data {
4
 
5
 #define EX(element) execute_data.element
6
 
7
-#define EX_TMP_VAR(ex, n)	   ((temp_variable*)(((char*)(ex)) + ((int)(n))))
8
-#define EX_TMP_VAR_NUM(ex, n)  (EX_TMP_VAR(ex, 0) - (1 + (n)))
9
-
10
 #define EX_CV_NUM(ex, n)       (((zval***)(((char*)(ex))+ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data))))+(n))
11
 
12
 
(-)lang/php56/files/patch-Zend_zend__execute.h (+18 lines)
Line 0 Link Here
1
--- Zend/zend_execute.h.orig	2018-02-27 23:15:25 UTC
2
+++ Zend/zend_execute.h
3
@@ -71,6 +71,15 @@ ZEND_API int zend_eval_stringl_ex(char *str, int str_l
4
 ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, ulong fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC);
5
 ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend_uint arg_num, const char *need_msg, const char *need_kind, const char *given_msg, const char *given_kind TSRMLS_DC);
6
 
7
+static zend_always_inline temp_variable *EX_TMP_VAR(void *ex, int n)
8
+{
9
+	return (temp_variable *)((zend_uintptr_t)ex + n);
10
+}
11
+static inline temp_variable *EX_TMP_VAR_NUM(void *ex, int n)
12
+{
13
+	return (temp_variable *)((zend_uintptr_t)ex - (1 + n) * sizeof(temp_variable));
14
+}
15
+
16
 static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC TSRMLS_DC)
17
 {
18
 	if (!Z_DELREF_P(zval_ptr)) {

Return to bug 227723