Merge branch 'PHP-7.1'

Author: nikic

ext/opcache/Optimizer/block_pass.c

@@ -736,7 +736,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 						literal_dtor(&ZEND_OP1_LITERAL(opline));
 					} else {
 						/* BOOL */
-						result = ZEND_OP1_LITERAL(opline);
+						ZVAL_COPY_VALUE(&result, &ZEND_OP1_LITERAL(opline));
 						convert_to_boolean(&result);
 						ZVAL_NULL(&ZEND_OP1_LITERAL(opline));
 					}
@@ -1657,11 +1657,12 @@ static void zend_t_usage(zend_cfg *cfg, zend_op_array *op_array, zend_bitset use
 						case ZEND_QM_ASSIGN:
 						case ZEND_BOOL:
 						case ZEND_BOOL_NOT:
-							if (ZEND_OP1_TYPE(opline) == IS_CONST) {
-								literal_dtor(&ZEND_OP1_LITERAL(opline));
-							} else if (ZEND_OP1_TYPE(opline) == IS_TMP_VAR) {
+							if (ZEND_OP1_TYPE(opline) == IS_TMP_VAR) {
 								opline->opcode = ZEND_FREE;
 							} else {
+								if (ZEND_OP1_TYPE(opline) == IS_CONST) {
+									literal_dtor(&ZEND_OP1_LITERAL(opline));
+								}
 								MAKE_NOP(opline);
 							}
 							break;