clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Simplify ZEND_EXIT and count boolean values to it as exit status"

Browse Source 
This reverts commit 7c003948c6.
This commit is contained in:
Dmitry Stogov 2015-08-12 02:58:21 +03:00
parent 9e290a44f1
commit fef086d113
5 changed files with 75 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -13,8 +13,6 @@ PHP NEWS
. Fixed bug #70198 (Checking liveness does not work as expected).
(Shafreeck Sea, Anatol Belski)
. Fixed bug #70241 (Skipped assertions affect Generator returns). (Bob)
. exit() and die() interpret all scalars except strings as exit_status now.
(Bob)
- CLI server:
. Fixed bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE).

1
UPGRADING
View File

@ -425,7 +425,6 @@ Other language changes
. Removed support for #-style comments in ini files. Use ;-style comments
instead.
. $HTTP_RAW_POST_DATA is no longer available. Use the php://input stream instead.
. exit() and die() interpret all scalars except strings as exit_status now.
Standard library changes
========================

25
Zend/zend_vm_def.h
View File

@ -6637,17 +6637,22 @@ ZEND_VM_HANDLER(79, ZEND_EXIT, CONST|TMPVAR|UNUSED|CV, ANY)
SAVE_OPLINE();
if (OP1_TYPE != IS_UNUSED) {
zend_free_op free_op1;
zval *ptr = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
zval *ptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else if (Z_TYPE_P(ptr) == IS_TRUE || Z_TYPE_P(ptr) == IS_FALSE || Z_TYPE_P(ptr) == IS_NULL) {
EG(exit_status) = Z_TYPE_P(ptr) == IS_TRUE;
} else if (Z_TYPE_P(ptr) == IS_DOUBLE) {
EG(exit_status) = (int) Z_DVAL_P(ptr);
} else {
zend_print_variable(ptr);
}
do {
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else {
if ((OP1_TYPE & (IS_VAR|IS_CV)) && Z_ISREF_P(ptr)) {
ptr = Z_REFVAL_P(ptr);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
break;
}
}
zend_print_variable(ptr);
}
} while (0);
FREE_OP1();
}
zend_bailout();

96
Zend/zend_vm_execute.h
View File

@ -3966,15 +3966,20 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_O
zval *ptr = EX_CONSTANT(opline->op1);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else if (Z_TYPE_P(ptr) == IS_TRUE || Z_TYPE_P(ptr) == IS_FALSE || Z_TYPE_P(ptr) == IS_NULL) {
EG(exit_status) = Z_TYPE_P(ptr) == IS_TRUE;
} else if (Z_TYPE_P(ptr) == IS_DOUBLE) {
EG(exit_status) = (int) Z_DVAL_P(ptr);
} else {
zend_print_variable(ptr);
}
do {
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else {
if ((IS_CONST & (IS_VAR|IS_CV)) && Z_ISREF_P(ptr)) {
ptr = Z_REFVAL_P(ptr);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
break;
}
}
zend_print_variable(ptr);
}
} while (0);
}
zend_bailout();
@ -22766,15 +22771,20 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_
zval *ptr = NULL;
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else if (Z_TYPE_P(ptr) == IS_TRUE || Z_TYPE_P(ptr) == IS_FALSE || Z_TYPE_P(ptr) == IS_NULL) {
EG(exit_status) = Z_TYPE_P(ptr) == IS_TRUE;
} else if (Z_TYPE_P(ptr) == IS_DOUBLE) {
EG(exit_status) = (int) Z_DVAL_P(ptr);
} else {
zend_print_variable(ptr);
}
do {
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else {
if ((IS_UNUSED & (IS_VAR|IS_CV)) && Z_ISREF_P(ptr)) {
ptr = Z_REFVAL_P(ptr);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
break;
}
}
zend_print_variable(ptr);
}
} while (0);
}
zend_bailout();
@ -29355,17 +29365,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCO
SAVE_OPLINE();
if (IS_CV != IS_UNUSED) {
zval *ptr = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var);
zval *ptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else if (Z_TYPE_P(ptr) == IS_TRUE || Z_TYPE_P(ptr) == IS_FALSE || Z_TYPE_P(ptr) == IS_NULL) {
EG(exit_status) = Z_TYPE_P(ptr) == IS_TRUE;
} else if (Z_TYPE_P(ptr) == IS_DOUBLE) {
EG(exit_status) = (int) Z_DVAL_P(ptr);
} else {
zend_print_variable(ptr);
}
do {
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else {
if ((IS_CV & (IS_VAR|IS_CV)) && Z_ISREF_P(ptr)) {
ptr = Z_REFVAL_P(ptr);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
break;
}
}
zend_print_variable(ptr);
}
} while (0);
}
zend_bailout();
@ -40492,17 +40507,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_EXIT_SPEC_TMPVAR_HANDLER(ZEND_
SAVE_OPLINE();
if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
zend_free_op free_op1;
zval *ptr = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1);
zval *ptr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else if (Z_TYPE_P(ptr) == IS_TRUE || Z_TYPE_P(ptr) == IS_FALSE || Z_TYPE_P(ptr) == IS_NULL) {
EG(exit_status) = Z_TYPE_P(ptr) == IS_TRUE;
} else if (Z_TYPE_P(ptr) == IS_DOUBLE) {
EG(exit_status) = (int) Z_DVAL_P(ptr);
} else {
zend_print_variable(ptr);
}
do {
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else {
if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && Z_ISREF_P(ptr)) {
ptr = Z_REFVAL_P(ptr);
if (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
break;
}
}
zend_print_variable(ptr);
}
} while (0);
zval_ptr_dtor_nogc(free_op1);
}
zend_bailout();

4
Zend/zend_vm_gen.php
View File

@ -186,7 +186,7 @@ $op1_get_zval_ptr_deref = array(
"CONST" => "EX_CONSTANT(opline->op1)",
"UNUSED" => "NULL",
"CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op1.var)",
"TMPVAR" => "_get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1)",
"TMPVAR" => "???",
);
$op2_get_zval_ptr_deref = array(
@ -196,7 +196,7 @@ $op2_get_zval_ptr_deref = array(
"CONST" => "EX_CONSTANT(opline->op2)",
"UNUSED" => "NULL",
"CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op2.var)",
"TMPVAR" => "_get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2)",
"TMPVAR" => "???",
);
$op1_get_zval_ptr_undef = array(