#50: fix JIT PHP issue with opcache.jit_hot_func=1 and bailout tests

Author: EdmondDantes

tests/bailout/003-stack-overflow-simple.phpt

@@ -7,6 +7,8 @@ if ($zend_mm_enabled === "0") {
     die("skip Zend MM disabled");
 }
 ?>
+--INI--
+opcache.jit_hot_func=0
 --FILE--
 <?php
 
@@ -16,13 +18,9 @@ function deepRecursion($depth = 0) {
     return deepRecursion($depth + 1);
 }
 
-$function = function(bool $out = true) {
-    if($out) echo "Shutdown function called\n";
-};
-
-$function(false);
-
-register_shutdown_function($function);
+register_shutdown_function(function() {
+    echo "Shutdown function called\n";
+});
 
 echo "Before spawn\n";
 

tests/bailout/004-stack-overflow-nested.phpt

@@ -1,5 +1,7 @@
 --TEST--
 Stack overflow bailout in nested async operations
+--INI--
+opcache.jit_hot_func=0
 --SKIPIF--
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
@@ -16,13 +18,9 @@ function deepRecursion($depth = 0) {
     return deepRecursion($depth + 1);
 }
 
-$function = function(bool $out = true) {
-    if($out) echo "Shutdown function called\n";
-};
-
-$function(false);
-
-register_shutdown_function($function);
+register_shutdown_function(function() {
+    echo "Shutdown function called\n";
+});
 
 echo "Before spawn\n";
 

tests/bailout/005-memory-exhaustion-during-suspend.phpt

@@ -46,4 +46,4 @@ After suspend
 Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
 
 Warning: Graceful shutdown mode was started in %s on line %d
-Shutdown function called
+Shutdown function called

tests/bailout/007-stack-overflow-with-suspend.phpt

@@ -1,5 +1,7 @@
 --TEST--
 Stack overflow bailout with suspend in recursion
+--INI--
+opcache.jit_hot_func=0
 --SKIPIF--
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
@@ -20,13 +22,9 @@ function deepRecursionWithSuspend($depth = 0) {
     return deepRecursionWithSuspend($depth + 1);
 }
 
-$function = function(bool $out = true) {
-    if($out) echo "Shutdown function called\n";
-};
-
-$function(false);
-
-register_shutdown_function($function);
+register_shutdown_function(function() {
+    echo "Shutdown function called\n";
+});
 
 echo "Before spawn\n";
 

tests/bailout/011-stack-overflow-during-await.phpt

@@ -1,5 +1,7 @@
 --TEST--
 Stack overflow bailout during await operation
+--INI--
+opcache.jit_hot_func=0
 --SKIPIF--
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
@@ -17,13 +19,9 @@ function deepRecursion($depth = 0) {
     return deepRecursion($depth + 1);
 }
 
-$function = function(bool $out = true) {
-    if($out) echo "Shutdown function called\n";
-};
-
-$function(false);
-
-register_shutdown_function($function);
+register_shutdown_function(function() {
+    echo "Shutdown function called\n";
+});
 
 echo "Before spawn\n";
 

tests/bailout/014-stack-overflow-with-finally.phpt

@@ -1,5 +1,7 @@
 --TEST--
 Stack overflow bailout with onFinally handlers
+--INI--
+opcache.jit_hot_func=0
 --SKIPIF--
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
@@ -25,18 +27,9 @@ echo "Before scope\n";
 
 $scope = new Scope();
 
-$finally = function($x = false, $out = true) {
-    if($out) {
-        echo "Finally handler executed\n";
-    }
-};
-
-// JIT PHP in tracing mode can compile functions on demand. When memory runs out,
-// JIT crashes with an error because it tries to compile a closure.
-// This code attempts to work around the issue so that the test runs correctly.
-$finally(false, false);
-
-$scope->onFinally($finally);
+$scope->onFinally(function() {
+    echo "Finally handler executed\n";
+});
 
 $coroutine = $scope->spawn(function() {
     echo "Before stack overflow\n";