com php-src: micro-optimization: Zend/zend_vm_def.h Zen d/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Mon, 18 Mar 2019 23:02:14 +0000 |
| Subject: | com php-src: micro-optimization: Zend/zend_vm_def.h Zen d/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105228@lists.php.net to get a copy of this message | ||
Commit: 9357953babf7863e27d6e42897f636f443819a8e
Author: Dmitry Stogov <dmitry@zend.com> Tue, 19 Mar 2019 02:02:14 +0300
Parents: abfab2148ddae50a1f26d313299d273a2f254c7a
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9357953babf7863e27d6e42897f636f443819a8e
Log:
micro-optimization
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 1d2073b..2fe4cc7 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -6548,6 +6548,14 @@ ZEND_VM_C_LABEL(num_index_prop):
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if (OP1_TYPE & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+ FREE_OP1();
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 72b98dc..eebf5e9 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5915,6 +5915,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if (IS_CONST & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
@@ -8004,6 +8012,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if (IS_CONST & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
@@ -10912,6 +10928,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if (IS_CONST & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
@@ -14364,6 +14388,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if ((IS_TMP_VAR|IS_VAR) & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+ zval_ptr_dtor_nogc(free_op1);
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
@@ -15863,6 +15895,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if ((IS_TMP_VAR|IS_VAR) & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+ zval_ptr_dtor_nogc(free_op1);
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
@@ -17476,6 +17516,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if ((IS_TMP_VAR|IS_VAR) & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+ zval_ptr_dtor_nogc(free_op1);
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
@@ -43862,6 +43910,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if (IS_CV & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
@@ -47851,6 +47907,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if (IS_CV & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}
@@ -53840,6 +53904,14 @@ num_index_prop:
/* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
+
+ if (IS_CV & (IS_CONST|IS_CV)) {
+ /* avoid exception check */
+
+ ZEND_VM_SMART_BRANCH(result, 0);
+ ZVAL_BOOL(EX_VAR(opline->result.var), result);
+ ZEND_VM_NEXT_OPCODE();
+ }
} else {
result = (value == NULL || !i_zend_is_true(value));
}