Fixed bug #78961 (erroneous optimization of re-assigned $GLOBALS)

Author: dstogov

NEWS

@@ -8,6 +8,7 @@ PHP                                                                        NEWS
     (Alexey Kachalin)
 
 - OPcache:
+  . Fixed bug #78961 (erroneous optimization of re-assigned $GLOBALS). (Dmitry)
   . Fixed bug #78950 (Preloading trait method with static variables). (Nikita)
   . Fixed bug #78903 (Conflict in RTD key for closures results in crash).
     (Nikita)

ext/opcache/Optimizer/pass1_5.c

@@ -515,6 +515,8 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 				zend_optimizer_collect_constant(ctx, &ZEND_OP1_LITERAL(opline), &ZEND_OP2_LITERAL(opline));
 			}
 			break;
+#if 0
+		/* see ext/opcache/tests/bug78961.phpt */
 //		case ZEND_FETCH_R:
 		case ZEND_FETCH_W:
 //		case ZEND_FETCH_RW:
@@ -558,6 +560,7 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 				MAKE_NOP(opline);
 			}
 			break;
+#endif
 
 		case ZEND_RETURN:
 		case ZEND_RETURN_BY_REF:

ext/opcache/tests/bug78961.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Bug #78961 (erroneous optimization of re-assigned $GLOBALS)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$GLOBALS = array();
+$GLOBALS['td'] = array();
+$GLOBALS['td']['nsno'] = 3;
+var_dump($GLOBALS['td']['nsno']);
+?>
+--EXPECT--
+int(3)