@@ -742,28 +742,18 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) /
742
742
call = zend_vm_stack_push_call_frame (ZEND_CALL_TOP_FUNCTION | ZEND_CALL_DYNAMIC ,
743
743
func , fci -> param_count , fci_cache -> called_scope , fci -> object );
744
744
745
- if (func -> common .fn_flags & (ZEND_ACC_ABSTRACT |ZEND_ACC_DEPRECATED )) {
746
- if (func -> common .fn_flags & ZEND_ACC_ABSTRACT ) {
747
- zend_throw_error (NULL , "Cannot call abstract method %s::%s()" , ZSTR_VAL (func -> common .scope -> name ), ZSTR_VAL (func -> common .function_name ));
745
+ if (UNEXPECTED (func -> common .fn_flags & ZEND_ACC_DEPRECATED )) {
746
+ zend_error (E_DEPRECATED , "Function %s%s%s() is deprecated" ,
747
+ func -> common .scope ? ZSTR_VAL (func -> common .scope -> name ) : "" ,
748
+ func -> common .scope ? "::" : "" ,
749
+ ZSTR_VAL (func -> common .function_name ));
750
+ if (UNEXPECTED (EG (exception ))) {
748
751
zend_vm_stack_free_call_frame (call );
749
752
if (EG (current_execute_data ) == & dummy_execute_data ) {
750
753
EG (current_execute_data ) = dummy_execute_data .prev_execute_data ;
751
754
}
752
755
return FAILURE ;
753
756
}
754
- if (func -> common .fn_flags & ZEND_ACC_DEPRECATED ) {
755
- zend_error (E_DEPRECATED , "Function %s%s%s() is deprecated" ,
756
- func -> common .scope ? ZSTR_VAL (func -> common .scope -> name ) : "" ,
757
- func -> common .scope ? "::" : "" ,
758
- ZSTR_VAL (func -> common .function_name ));
759
- if (UNEXPECTED (EG (exception ))) {
760
- zend_vm_stack_free_call_frame (call );
761
- if (EG (current_execute_data ) == & dummy_execute_data ) {
762
- EG (current_execute_data ) = dummy_execute_data .prev_execute_data ;
763
- }
764
- return FAILURE ;
765
- }
766
- }
767
757
}
768
758
769
759
for (i = 0 ; i < fci -> param_count ; i ++ ) {
@@ -844,12 +834,6 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) /
844
834
EG (current_execute_data ) = call -> prev_execute_data ;
845
835
zend_vm_stack_free_args (call );
846
836
847
- /* We shouldn't fix bad extensions here,
848
- because it can break proper ones (Bug #34045)
849
- if (!EX(function_state).function->common.return_reference)
850
- {
851
- INIT_PZVAL(f->retval);
852
- }*/
853
837
if (EG (exception )) {
854
838
zval_ptr_dtor (fci -> retval );
855
839
ZVAL_UNDEF (fci -> retval );
0 commit comments