summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-07-24 17:30:38 +0300
committerDmitry Stogov <dmitry@zend.com>2019-07-24 17:30:38 +0300
commit6191df75537b42e75c6ba4bd311fd962bb6952cd (patch)
tree6fee387cef163e6681407ec6813c0df2abc21463
parentb05f3643338a1647604fbddf3607fc9826713e25 (diff)
downloadphp-git-6191df75537b42e75c6ba4bd311fd962bb6952cd.tar.gz
Avoid reloading
-rw-r--r--Zend/zend_vm_def.h6
-rw-r--r--Zend/zend_vm_execute.h18
2 files changed, 16 insertions, 8 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 8f6015da4f..a86813412d 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1000,8 +1000,10 @@ ZEND_VM_COLD_CONST_HANDLER(13, ZEND_BW_NOT, CONST|TMPVAR|CV, ANY)
}
SAVE_OPLINE();
- bitwise_not_function(EX_VAR(opline->result.var),
- GET_OP1_ZVAL_PTR(BP_VAR_R));
+ if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
+ op1 = ZVAL_UNDEFINED_OP1();
+ }
+ bitwise_not_function(EX_VAR(opline->result.var), op1);
FREE_OP1();
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 109286c02d..eb95d3bd44 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -3244,8 +3244,10 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BW_NOT_SPEC_CONST
}
SAVE_OPLINE();
- bitwise_not_function(EX_VAR(opline->result.var),
- RT_CONSTANT(opline, opline->op1));
+ if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
+ op1 = ZVAL_UNDEFINED_OP1();
+ }
+ bitwise_not_function(EX_VAR(opline->result.var), op1);
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
}
@@ -13212,8 +13214,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BW_NOT_SPEC_TMPVAR_HANDLER(ZEN
}
SAVE_OPLINE();
- bitwise_not_function(EX_VAR(opline->result.var),
- _get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC));
+ if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
+ op1 = ZVAL_UNDEFINED_OP1();
+ }
+ bitwise_not_function(EX_VAR(opline->result.var), op1);
zval_ptr_dtor_nogc(free_op1);
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
}
@@ -36417,8 +36421,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BW_NOT_SPEC_CV_HANDLER(ZEND_OP
}
SAVE_OPLINE();
- bitwise_not_function(EX_VAR(opline->result.var),
- _get_zval_ptr_cv_BP_VAR_R(opline->op1.var EXECUTE_DATA_CC));
+ if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
+ op1 = ZVAL_UNDEFINED_OP1();
+ }
+ bitwise_not_function(EX_VAR(opline->result.var), op1);
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
}