Test fibers, move bailout context bump, remove hash guard

Unfortunately, we always need to check for the hash, because even if we're in
the main context, the current guard may have been created in a fiber.

Author: iluuu1994

Zend/tests/gh14983.phpt Zend/tests/gh14983_1.phptZend/tests/gh14983.phpt renamed to Zend/tests/gh14983_1.phpt

@@ -0,0 +1,32 @@
+--TEST--
+GH-14983: Shutdown disregards guards active on bailout
+--FILE--
+<?php
+
+class Foo {
+    public function __get($prop) {
+        echo "__set($prop)\n";
+        if (Fiber::getCurrent()) {
+            Fiber::suspend();
+            echo "Resuming\n";
+        }
+    }
+}
+
+$foo = new Foo();
+
+$fiber = new Fiber(function () use ($foo) {
+    $foo->bar;
+});
+
+$value = $fiber->start();
+echo "Suspended\n";
+$foo->bar;
+$fiber->resume('test');
+
+?>
+--EXPECT--
+__set(bar)
+Suspended
+__set(bar)
+Resuming

Zend/tests/gh14983_2.phpt

@@ -1240,6 +1240,7 @@ ZEND_API ZEND_COLD ZEND_NORETURN void _zend_bailout(const char *filename, uint32
 	CG(in_compilation) = 0;
 	CG(memoize_mode) = 0;
 	EG(current_execute_data) = NULL;
+	EG(guard_context) = (uint32_t)-1;
 	LONGJMP(*EG(bailout), FAILURE);
 }
 /* }}} */

Zend/zend.c

@@ -297,8 +297,8 @@ struct _zend_executor_globals {
 
 	/* Guards are context dependent. I.e. if __get() is being called for an object
 	 * within a fiber, the guard will _not_ skip __get() in the main context. To
-	 * achieve this, we offset the guard string has by the guard context.
-	 * Additionally, shutdown will discard the current guards in the same way. */
+	 * achieve this, we offset the guard string hash by the guard context.
+	 * Additionally, bailout will discard the current guards in the same way. */
 	uint32_t guard_context;
 	uint32_t guard_context_counter;
 

Zend/zend_globals.h

@@ -578,8 +578,8 @@ ZEND_API uint32_t *zend_get_property_guard(zend_object *zobj, zend_string *membe
 		zend_string *str = Z_STR_P(zv);
 		if (EXPECTED(str == member) ||
 		    /* str and member don't necessarily have a pre-calculated hash value here */
-		    (EXPECTED(zend_string_equal_content(str, member))
-		        && (EG(guard_context) == 0 || ZSTR_HASH(str) == ZSTR_HASH(member)))) {
+		    (EXPECTED(ZSTR_HASH(str) == ZSTR_HASH(member)
+		        && zend_string_equal_content(str, member)))) {
 			zend_string_release(member);
 			return &Z_GUARD_P(zv);
 		} else if (EXPECTED(Z_GUARD_P(zv) == 0)) {

Zend/zend_object_handlers.c

@@ -1858,7 +1858,6 @@ void php_request_shutdown(void *dummy)
 	 * inside zend_executor callback functions.
 	 */
 	EG(current_execute_data) = NULL;
-	EG(guard_context) = (uint32_t)-1;
 
 	php_deactivate_ticks();