com php-src: ZEND_CATCH support for IS_INDIRECT: Zend/zend_vm_def.h Zend/zend_vm_execute.h

From: Date: Mon, 24 Feb 2014 08:29:35 +0000
Subject: com php-src: ZEND_CATCH support for IS_INDIRECT: Zend/zend_vm_def.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77974@lists.php.net to get a copy of this message
Commit: 074391de886ecc6a6000f347c8228d296f330198 Author: Dmitry Stogov <dmitry@zend.com> Mon, 24 Feb 2014 12:29:35 +0400 Parents: f1dcbf4750aea98143644a146e8bbd0d88126b46 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=074391de886ecc6a6000f347c8228d296f330198 Log: ZEND_CATCH support for IS_INDIRECT Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 158cbae..9dc6318 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def..h @@ -2944,8 +2944,8 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV) ZVAL_OBJ(EX_VAR_NUM(opline->op2.var), EG(exception)); if (EG(active_symbol_table)) { zend_string *cv = CV_DEF_OF(opline->op2.var); - // TODO: indirect??? - zend_hash_update(EG(active_symbol_table), cv, EX_VAR_NUM(opline->op2.var)); + zval *zv = zend_hash_update(EG(active_symbol_table), cv, EX_VAR_NUM(opline->op2.var)); + ZVAL_INDIRECT(EX_VAR_NUM(opline->op2.var), zv); } if (UNEXPECTED(EG(exception) != exception)) { EG(exception)->gc.refcount++; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index cb1ffff...80e68c2 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -7100,8 +7100,8 @@ static int ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A ZVAL_OBJ(EX_VAR_NUM(opline->op2.var), EG(exception)); if (EG(active_symbol_table)) { zend_string *cv = CV_DEF_OF(opline->op2.var); - // TODO: indirect??? - zend_hash_update(EG(active_symbol_table), cv, EX_VAR_NUM(opline->op2.var)); + zval *zv = zend_hash_update(EG(active_symbol_table), cv, EX_VAR_NUM(opline->op2.var)); + ZVAL_INDIRECT(EX_VAR_NUM(opline->op2.var), zv); } if (UNEXPECTED(EG(exception) != exception)) { EG(exception)->gc.refcount++;

« previous php.cvs (#77974) next »