com php-src: this was checked on write too: Zend/zend_vm_de f.h Zend/zend_vm_execute.h

From: Date: Wed, 06 Apr 2016 21:27:30 +0000
Subject: com php-src: this was checked on write too: Zend/zend_vm_de f.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95569@lists.php.net to get a copy of this message
Commit: 6f57c44d2c61ed553d572eb5c5dc88b4e149b27b Author: Joe Watkins <krakjoe@php.net> Wed, 6 Apr 2016 22:27:30 +0100 Parents: 239216a3dd6861c27c2f50100c8fded4640aaf8f Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6f57c44d2c61ed553d572eb5c5dc88b4e149b27b Log: this was checked on write too 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 7e3437c..69db951 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1856,7 +1856,7 @@ ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, CONST|TMP|VAR|UNUSED|THIS|CV, CONST|TMPVAR retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + ZEND_VM_C_GOTO(fetch_obj_r_exit); } } } @@ -1888,7 +1888,7 @@ ZEND_VM_C_LABEL(fetch_obj_r_no_object): } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); HANDLE_EXCEPTION(); - } + } } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 0308a60..3fdec95 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5669,7 +5669,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_H retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -9543,7 +9543,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HAND retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -11495,7 +11495,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_TMPVAR_ retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -14024,7 +14024,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HAN retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -15279,7 +15279,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLE retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -15835,7 +15835,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_TMPVAR_HA retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -18618,7 +18618,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HAN retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -23110,7 +23110,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_CV_HANDLE retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -25787,7 +25787,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_TMPVAR_HA retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -28262,7 +28262,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CONST_ retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -31708,7 +31708,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HAN retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -34086,7 +34086,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMPVAR retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -39062,7 +39062,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CONST_HAND retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -45610,7 +45610,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } } @@ -49372,7 +49372,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HAN retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); if (EXPECTED(retval)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } }

« previous php.cvs (#95569) next »