Fix crash when php55-opcache is compiled with clang 6 or later. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227723 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -401,9 +401,6 @@ #define EX(element) execute_data.element -#define EX_TMP_VAR(ex, n) ((temp_variable*)(((char*)(ex)) + ((int)(n)))) -#define EX_TMP_VAR_NUM(ex, n) (EX_TMP_VAR(ex, 0) - (1 + (n))) - #define EX_CV_NUM(ex, n) (((zval***)(((char*)(ex))+ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data))))+(n)) --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -71,6 +71,15 @@ 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); 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); +static zend_always_inline temp_variable *EX_TMP_VAR(void *ex, int n) +{ + return (temp_variable *)((zend_uintptr_t)ex + n); +} +static inline temp_variable *EX_TMP_VAR_NUM(void *ex, int n) +{ + return (temp_variable *)((zend_uintptr_t)ex - (1 + n) * sizeof(temp_variable)); +} + static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC) { if (!Z_DELREF_P(zval_ptr)) {