mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Specialize out useless checks. Only IS_VAR may be EG(error).

Browse Source
This commit is contained in:
Dmitry Stogov 2015-06-04 17:20:37 +03:00
parent 9ca564d5f3
commit f07d770f0b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_vm_def.h
View File

@ -2229,7 +2229,7 @@ ZEND_VM_C_LABEL(assign_dim_convert_to_array):
ZEND_VM_C_GOTO(try_assign_dim_array);
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (OP1_TYPE == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
ZEND_VM_C_GOTO(assign_dim_clean);
}
ZEND_VM_C_GOTO(assign_dim_convert_to_array);

16
Zend/zend_vm_execute.h
View File

@ -17469,7 +17469,7 @@ assign_dim_convert_to_array:
goto try_assign_dim_array;
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
goto assign_dim_clean;
}
goto assign_dim_convert_to_array;
@ -19110,7 +19110,7 @@ assign_dim_convert_to_array:
goto try_assign_dim_array;
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
goto assign_dim_clean;
}
goto assign_dim_convert_to_array;
@ -20640,7 +20640,7 @@ assign_dim_convert_to_array:
goto try_assign_dim_array;
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
goto assign_dim_clean;
}
goto assign_dim_convert_to_array;
@ -22293,7 +22293,7 @@ assign_dim_convert_to_array:
goto try_assign_dim_array;
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (IS_VAR == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
goto assign_dim_clean;
}
goto assign_dim_convert_to_array;
@ -31649,7 +31649,7 @@ assign_dim_convert_to_array:
goto try_assign_dim_array;
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
goto assign_dim_clean;
}
goto assign_dim_convert_to_array;
@ -34385,7 +34385,7 @@ assign_dim_convert_to_array:
goto try_assign_dim_array;
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
goto assign_dim_clean;
}
goto assign_dim_convert_to_array;
@ -36644,7 +36644,7 @@ assign_dim_convert_to_array:
goto try_assign_dim_array;
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
goto assign_dim_clean;
}
goto assign_dim_convert_to_array;
@ -39292,7 +39292,7 @@ assign_dim_convert_to_array:
goto try_assign_dim_array;
}
} else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
if (UNEXPECTED(object_ptr == &EG(error_zval))) {
if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
goto assign_dim_clean;
}
goto assign_dim_convert_to_array;