]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c4f38d 9e4603f)
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 24 Jul 2019 07:55:09 +0000 (09:55 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 24 Jul 2019 07:55:09 +0000 (09:55 +0200)
1  2 
Zend/zend_execute.c patch | diff1 | diff2 | blob | history
Zend/zend_vm_def.h patch | diff1 | diff2 | blob | history
Zend/zend_vm_execute.h patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_execute.c
Simple merge
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
index 7f9270d9d28634aa04f12628f08b6be72b2d9300,7da4690affa49a3356377d9b32db7b6309011e77..b375ecfd0f90cadc3d0d57defc586404462b0fc2
--- 1/Zend/zend_vm_execute.h
--- 2/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -5342,12 -5347,12 +5344,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -5463,12 -5455,12 +5465,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -7615,12 -7602,12 +7621,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -7736,12 -7710,12 +7742,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -10050,12 -10024,12 +10062,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -10171,12 -10132,12 +10183,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CONST & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -14443,12 -14395,12 +14457,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -14564,12 -14503,12 +14578,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -15897,12 -15810,12 +15911,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -16018,12 -15918,12 +16032,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -17124,12 -16998,12 +17138,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -17245,12 -17106,12 +17259,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || ((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -31177,12 -30607,12 +31219,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -31351,12 -30768,12 +31393,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -33152,12 -32421,12 +33196,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -33321,12 -32577,12 +33365,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -35793,12 -34906,12 +35839,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -35962,12 -35062,12 +36008,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_UNUSED & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -40282,12 -39227,12 +40332,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -40456,12 -39388,12 +40506,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -43928,12 -42709,12 +43982,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -44097,12 -42865,12 +44151,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
@@@ -49134,12 -47751,12 +49194,12 @@@ fetch_obj_r_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_r_copy;
                                                                } else {
                                                                        goto fetch_obj_r_fast_copy;
@@@ -49303,12 -47907,12 +49363,12 @@@ fetch_obj_is_fast_copy
                                                        Bucket *p = (Bucket*)((char*)zobj->properties->arData + idx);
  
                                                        if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) &&
 -                                                      (EXPECTED(p->key == Z_STR_P(offset)) ||
 -                                                       (EXPECTED(p->h == ZSTR_H(Z_STR_P(offset))) &&
 +                                                      (EXPECTED(p->key == name) ||
 +                                                       (EXPECTED(p->h == ZSTR_H(name)) &&
                                                          EXPECTED(p->key != NULL) &&
 -                                                        EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
 +                                                        EXPECTED(zend_string_equal_content(p->key, name))))) {
                                                                retval = &p->val;
-                                                               if (!ZEND_VM_SPEC || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
+                                                               if (0 || (IS_CV & (IS_TMP_VAR|IS_VAR)) != 0) {
                                                                        goto fetch_obj_is_copy;
                                                                } else {
                                                                        goto fetch_obj_is_fast_copy;
Unnamed repository; edit this file 'description' to name the repository.