diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-07 15:50:44 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-07 15:50:44 +0400 |
| commit | 5aa91be509731eb46acff242412941325122ab03 (patch) | |
| tree | 4e34ad2a092564393fb453773199c1e914eb9edb /ext/spl/php_spl.c | |
| parent | 6bf24f4dd01331122a0f10db392c08605f159826 (diff) | |
| download | php-git-5aa91be509731eb46acff242412941325122ab03.tar.gz | |
Simplify call-frame handling
Diffstat (limited to 'ext/spl/php_spl.c')
| -rw-r--r-- | ext/spl/php_spl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index e5f968e26b..cd0a050b98 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -287,11 +287,6 @@ static int spl_autoload(zend_string *class_name, zend_string *lc_name, const cha STR_RELEASE(opened_path); if (new_op_array) { ZVAL_UNDEF(&result); - if (EG(current_execute_data)) { - EG(current_execute_data)->call = zend_vm_stack_push_call_frame( - (zend_function*)new_op_array, 0, 0, EG(current_execute_data)->called_scope, Z_OBJ(EG(This)), EG(current_execute_data)->call TSRMLS_CC); - EG(current_execute_data)->call->symbol_table = zend_rebuild_symbol_table(TSRMLS_C); - } zend_execute(new_op_array, &result TSRMLS_CC); destroy_op_array(new_op_array TSRMLS_CC); @@ -356,7 +351,7 @@ PHP_FUNCTION(spl_autoload) while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) { ex = ex->prev_execute_data; } - if (ex && ex->opline && ex->opline->opcode != ZEND_FETCH_CLASS) { + if (ex && ex->opline->opcode != ZEND_FETCH_CLASS) { zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Class %s could not be loaded", class_name->val); } else { php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s could not be loaded", class_name->val); |