[php-src] master: Fix merge
| From: | ndossche | Date: | Fri, 09 Oct 2026 17:12:37 +0000 |
| Subject: | [php-src] master: Fix merge | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142128@lists.php.net to get a copy of this message | ||
Author: ndossche (ndossche)
Date: 2026-10-09T19:12:18+02:00
Commit: https://github.com/php/php-src/commit/bb89d751db3962191500c2ec751734bde3205b08
Raw diff: https://github.com/php/php-src/commit/bb89d751db3962191500c2ec751734bde3205b08.diff
Fix merge
Changed paths:
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 53c692eda374..9be9b8441c87 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -123708,13 +123708,8 @@ ZEND_API void ZEND_FASTCALL zend_vm_set_opcode_handler_ex(zend_op* op,
uint32_t
}
break;
case ZEND_COUNT:
-<<<<<<< HEAD
- if ((op1_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF)) == MAY_BE_ARRAY) {
- spec = 2571 | SPEC_RULE_OP1;
-=======
if (op->op1_type != IS_CONST && (op1_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF))
== MAY_BE_ARRAY) {
- spec = 2580 | SPEC_RULE_OP1;
->>>>>>> PHP-8.5
+ spec = 2571 | SPEC_RULE_OP1;
}
break;
case ZEND_BW_OR: