com php-src: Use more specific op type: Zend/zend_vm_def. h Zend/zend_vm_execute.h

Commit: 9b07ed6dcc6f0f77fa75ee6a5c2b21298b87f509 Author: Xinchen Hui <laruence@php.net> Wed, 18 Mar 2015 20:56:28 +0800 Parents: 4e110954381e9f4f2ad0354702409b1b2f89cf94 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9b07ed6dcc6f0f77fa75ee6a5c2b21298b87f509 Log: Use more specific op type 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 ab2c7b8..a460c0f 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -7363,7 +7363,7 @@ ZEND_VM_HANDLER(151, ZEND_ASSERT_CHECK, ANY, ANY) } } -ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, ANY, ANY) +ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, UNUSED, UNUSED) { USE_OPLINE @@ -7373,4 +7373,4 @@ ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, ANY, ANY) ZVAL_EMPTY_STRING(EX_VAR(opline->result.var)); } ZEND_VM_NEXT_OPCODE(); -} \ No newline at end of file +} diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index e5547f3..7d36fd7 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1779,17 +1779,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSERT_CHECK_SPEC_HANDLER(ZEND } } -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) -{ - USE_OPLINE - - if (EG(scope) && EG(scope)->name) { - ZVAL_STR_COPY(EX_VAR(opline->result.var), EG(scope)->name); - } else { - ZVAL_EMPTY_STRING(EX_VAR(opline->result.var)); - } - ZEND_VM_NEXT_OPCODE(); -}static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -23024,6 +23014,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_SPEC_UNUSED_UNUSED_HANDL ZEND_VM_RETURN(); } +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + if (EG(scope) && EG(scope)->name) { + ZVAL_STR_COPY(EX_VAR(opline->result.var), EG(scope)->name); + } else { + ZVAL_EMPTY_STRING(EX_VAR(opline->result.var)); + } + ZEND_VM_NEXT_OPCODE(); +} static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(binary_op_type binary_op ZEND_OPCODE_HANDLER_ARGS_DC) { USE_OPLINE @@ -45500,31 +45501,31 @@ void zend_init_opcodes_handlers(void) ZEND_NULL_HANDLER, ZEND_NULL_HANDLER, ZEND_NULL_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, - ZEND_FETCH_CLASS_NAME_SPEC_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_FETCH_CLASS_NAME_SPEC_UNUSED_UNUSED_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, ZEND_NULL_HANDLER, ZEND_NULL_HANDLER, ZEND_NULL_HANDLER,