com php-src: Refix opline usage: Zend/zend_vm_def.h Zen d/zend_vm_execute.h

From: Date: Mon, 20 Apr 2015 02:53:58 +0000
Subject: com php-src: Refix opline usage: Zend/zend_vm_def.h Zen d/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86395@lists.php.net to get a copy of this message
Commit: a819404e9e4a96ee80975e05de053a6e210f6c41 Author: Xinchen Hui <laruence@php.net> Mon, 20 Apr 2015 10:51:55 +0800 Parents: b1bd6f502faa546d575eb24adcd2c4ca69628614 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a819404e9e4a96ee80975e05de053a6e210f6c41 Log: Refix opline usage 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 25f6bf8..c3022ef 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -7857,7 +7857,7 @@ ZEND_VM_C_LABEL(call_trampoline_end): ZEND_VM_RETURN(); } - opline = execute_data->opline; + LOAD_OPLINE(); if (object) { OBJ_RELEASE(object); @@ -7866,8 +7866,8 @@ ZEND_VM_C_LABEL(call_trampoline_end): if (UNEXPECTED(EG(exception) != NULL)) { zend_throw_exception_internal(NULL); - if (RETURN_VALUE_USED(opline)) { - zval_ptr_dtor(EX_VAR(opline->result.var)); + if (RETURN_VALUE_USED(OPLINE)) { + zval_ptr_dtor(EX_VAR(OPLINE->result.var)); } HANDLE_EXCEPTION_LEAVE(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 56a40f8..efa0893 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1893,7 +1893,7 @@ call_trampoline_end: ZEND_VM_RETURN(); } - opline = execute_data->opline; + LOAD_OPLINE(); if (object) { OBJ_RELEASE(object); @@ -1902,8 +1902,8 @@ call_trampoline_end: if (UNEXPECTED(EG(exception) != NULL)) { zend_throw_exception_internal(NULL); - if (RETURN_VALUE_USED(opline)) { - zval_ptr_dtor(EX_VAR(opline->result.var)); + if (RETURN_VALUE_USED(OPLINE)) { + zval_ptr_dtor(EX_VAR(OPLINE->result.var)); } HANDLE_EXCEPTION_LEAVE(); }

« previous php.cvs (#86395) next »