Don't create an actual variable for $GLOBALS

Author: nikic

Zend/tests/restrict_globals/globals_in_globals.phpt

@@ -0,0 +1,11 @@
+--TEST--
+$GLOBALS no longer contains 'GLOBALS'
+--FILE--
+<?php
+
+$g = $GLOBALS;
+var_dump(isset($g['GLOBALS']));
+
+?>
+--EXPECT--
+bool(false)

Zend/zend.c

@@ -786,13 +786,8 @@ static void module_destructor_zval(zval *zv) /* {{{ */
 
 static zend_bool php_auto_globals_create_globals(zend_string *name) /* {{{ */
 {
-	zval globals;
-
-	/* IS_ARRAY, but with ref-counter 1 and not IS_TYPE_REFCOUNTED */
-	ZVAL_ARR(&globals, &EG(symbol_table));
-	Z_TYPE_FLAGS_P(&globals) = 0;
-	ZVAL_NEW_REF(&globals, &globals);
-	zend_hash_update(&EG(symbol_table), name, &globals);
+	/* While we keep registering $GLOBALS as an auto-global, we do not create an
+	 * actual variable for it. Access to it handled specially by the compiler. */
 	return 0;
 }
 /* }}} */

Zend/zend_compile.c

@@ -8770,6 +8770,12 @@ void zend_compile_isset_or_empty(znode *result, zend_ast *ast) /* {{{ */
 		}
 	}
 
+	if (is_globals_fetch(var_ast)) {
+		result->op_type = IS_CONST;
+		ZVAL_BOOL(&result->u.constant, ast->kind == ZEND_AST_ISSET);
+		return;
+	}
+
 	if (is_global_var_fetch(var_ast)) {
 		zend_compile_expr(&var_node, var_ast->child[1]);
 		if (var_node.op_type == IS_CONST) {