Index: head/www/php71-opcache/Makefile =================================================================== --- head/www/php71-opcache/Makefile (revision 456287) +++ head/www/php71-opcache/Makefile (revision 456288) @@ -1,11 +1,12 @@ # $FreeBSD$ CATEGORIES= www MASTERDIR= ${.CURDIR}/../../lang/php71 +PORTREVISION= 2 PKGNAMESUFFIX= -opcache USES= php:zend .include "${MASTERDIR}/Makefile" Index: head/www/php71-opcache/files/patch-Optimizer_zend__inference.c =================================================================== --- head/www/php71-opcache/files/patch-Optimizer_zend__inference.c (nonexistent) +++ head/www/php71-opcache/files/patch-Optimizer_zend__inference.c (revision 456288) @@ -0,0 +1,30 @@ +--- Optimizer/zend_inference.c.orig 2017-12-12 12:05:15 UTC ++++ Optimizer/zend_inference.c +@@ -2928,7 +2928,7 @@ static int zend_update_type_info(const z + break; + case ZEND_FE_FETCH_R: + case ZEND_FE_FETCH_RW: +- tmp = (t2 & MAY_BE_REF); ++ tmp = t2; + if (t1 & MAY_BE_OBJECT) { + if (opline->opcode == ZEND_FE_FETCH_RW) { + tmp |= MAY_BE_REF | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; +@@ -2953,7 +2953,7 @@ static int zend_update_type_info(const z + } + UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def); + if (ssa_ops[i].result_def >= 0) { +- tmp = 0; ++ tmp = (ssa_ops[i].result_use >= 0) ? RES_USE_INFO() : 0; + if (t1 & MAY_BE_OBJECT) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + } +@@ -3079,7 +3079,8 @@ static int zend_update_type_info(const z + UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); + } else { + /* invalid key type */ +- UPDATE_SSA_TYPE(t1, ssa_ops[i].op1_def); ++ tmp = (tmp & (MAY_BE_RC1|MAY_BE_RCN)) | (t1 & ~(MAY_BE_RC1|MAY_BE_RCN)); ++ UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); + } + COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); + } Property changes on: head/www/php71-opcache/files/patch-Optimizer_zend__inference.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property