From 68381457cc5370935bc7c69eeeac772be255174e Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 24 Jan 2023 09:55:47 +0300
Subject: [PATCH] Fix test failures when PHP is compiled without
 ZEND_CHECK_STACK_LIMIT (e.g. 32-bit CLANG build with address sanitizer)

---
 Zend/tests/stack_limit/stack_limit_001.phpt | 1 +
 Zend/tests/stack_limit/stack_limit_002.phpt | 1 +
 Zend/tests/stack_limit/stack_limit_003.phpt | 4 ++++
 Zend/tests/stack_limit/stack_limit_004.phpt | 4 ++++
 Zend/tests/stack_limit/stack_limit_005.phpt | 4 ++++
 Zend/tests/stack_limit/stack_limit_006.phpt | 1 +
 Zend/tests/stack_limit/stack_limit_007.phpt | 4 ++++
 Zend/tests/stack_limit/stack_limit_008.phpt | 4 ++++
 Zend/tests/stack_limit/stack_limit_009.phpt | 1 +
 Zend/tests/stack_limit/stack_limit_010.phpt | 1 +
 Zend/tests/stack_limit/stack_limit_011.phpt | 4 ++++
 Zend/tests/stack_limit/stack_limit_012.phpt | 4 ++++
 12 files changed, 33 insertions(+)

diff --git a/Zend/tests/stack_limit/stack_limit_001.phpt b/Zend/tests/stack_limit/stack_limit_001.phpt
index 534c3cf6574..ca185635c39 100644
--- a/Zend/tests/stack_limit/stack_limit_001.phpt
+++ b/Zend/tests/stack_limit/stack_limit_001.phpt
@@ -2,6 +2,7 @@
 Stack limit 001 - Stack limit checks with max_allowed_stack_size detection
 --SKIPIF--
 <?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
 if (getenv('SKIP_MSAN')) die("skip msan requires a considerably higher zend.reserved_stack_size due to instrumentation");
 ?>
 --EXTENSIONS--
diff --git a/Zend/tests/stack_limit/stack_limit_002.phpt b/Zend/tests/stack_limit/stack_limit_002.phpt
index 337900ae846..309de9bf6a2 100644
--- a/Zend/tests/stack_limit/stack_limit_002.phpt
+++ b/Zend/tests/stack_limit/stack_limit_002.phpt
@@ -2,6 +2,7 @@
 Stack limit 002 - Stack limit checks with max_allowed_stack_size detection (fibers)
 --SKIPIF--
 <?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
 if (getenv('SKIP_MSAN')) die("skip msan requires a considerably higher zend.reserved_stack_size due to instrumentation");
 ?>
 --EXTENSIONS--
diff --git a/Zend/tests/stack_limit/stack_limit_003.phpt b/Zend/tests/stack_limit/stack_limit_003.phpt
index 51bf51f2ab2..9eb94a97163 100644
--- a/Zend/tests/stack_limit/stack_limit_003.phpt
+++ b/Zend/tests/stack_limit/stack_limit_003.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Stack limit 003 - Stack limit checks with fixed max_allowed_stack_size
+--SKIPIF--
+<?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
+?>
 --EXTENSIONS--
 zend_test
 --INI--
diff --git a/Zend/tests/stack_limit/stack_limit_004.phpt b/Zend/tests/stack_limit/stack_limit_004.phpt
index a3da4664edb..141a24babb9 100644
--- a/Zend/tests/stack_limit/stack_limit_004.phpt
+++ b/Zend/tests/stack_limit/stack_limit_004.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Stack limit 004 - Stack limit checks with fixed max_allowed_stack_size (fibers)
+--SKIPIF--
+<?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
+?>
 --EXTENSIONS--
 zend_test
 --FILE--
diff --git a/Zend/tests/stack_limit/stack_limit_005.phpt b/Zend/tests/stack_limit/stack_limit_005.phpt
index 6e50bd34e7e..3fcd5d57282 100644
--- a/Zend/tests/stack_limit/stack_limit_005.phpt
+++ b/Zend/tests/stack_limit/stack_limit_005.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Stack limit 005 - Internal stack limit check in zend_compile_expr()
+--SKIPIF--
+<?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
+?>
 --EXTENSIONS--
 zend_test
 --INI--
diff --git a/Zend/tests/stack_limit/stack_limit_006.phpt b/Zend/tests/stack_limit/stack_limit_006.phpt
index 3f03807783d..0b51fabb4ba 100644
--- a/Zend/tests/stack_limit/stack_limit_006.phpt
+++ b/Zend/tests/stack_limit/stack_limit_006.phpt
@@ -2,6 +2,7 @@
 Stack limit 006 - env size affects __libc_stack_end
 --SKIPIF--
 <?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
 if (getenv('SKIP_MSAN')) die("skip msan requires a considerably higher zend.reserved_stack_size due to instrumentation");
 ?>
 --EXTENSIONS--
diff --git a/Zend/tests/stack_limit/stack_limit_007.phpt b/Zend/tests/stack_limit/stack_limit_007.phpt
index 7994bb66f1e..411af1d2c68 100644
--- a/Zend/tests/stack_limit/stack_limit_007.phpt
+++ b/Zend/tests/stack_limit/stack_limit_007.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Stack limit 007 - Exception handling
+--SKIPIF--
+<?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
+?>
 --EXTENSIONS--
 zend_test
 --INI--
diff --git a/Zend/tests/stack_limit/stack_limit_008.phpt b/Zend/tests/stack_limit/stack_limit_008.phpt
index 9609667bf3b..56ff6f18bdc 100644
--- a/Zend/tests/stack_limit/stack_limit_008.phpt
+++ b/Zend/tests/stack_limit/stack_limit_008.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Stack limit 008 - Exception handling
+--SKIPIF--
+<?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
+?>
 --EXTENSIONS--
 zend_test
 --INI--
diff --git a/Zend/tests/stack_limit/stack_limit_009.phpt b/Zend/tests/stack_limit/stack_limit_009.phpt
index b0567336b55..f17ecb5ede2 100644
--- a/Zend/tests/stack_limit/stack_limit_009.phpt
+++ b/Zend/tests/stack_limit/stack_limit_009.phpt
@@ -2,6 +2,7 @@
 Stack limit 009 - Check that we can actually use all the stack
 --SKIPIF--
 <?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
 if (getenv('SKIP_MSAN')) die("skip msan requires a considerably higher zend.reserved_stack_size due to instrumentation");
 ?>
 --EXTENSIONS--
diff --git a/Zend/tests/stack_limit/stack_limit_010.phpt b/Zend/tests/stack_limit/stack_limit_010.phpt
index c9ca8c7d7f7..312c2cf5516 100644
--- a/Zend/tests/stack_limit/stack_limit_010.phpt
+++ b/Zend/tests/stack_limit/stack_limit_010.phpt
@@ -4,6 +4,7 @@ Stack limit 010 - Check stack size detection against known defaults
 zend_test
 --SKIPIF--
 <?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
 if (!getenv('STACK_LIMIT_DEFAULTS_CHECK')) { die('skip STACK_LIMIT_DEFAULTS_CHECK not set'); }
 ?>
 --FILE--
diff --git a/Zend/tests/stack_limit/stack_limit_011.phpt b/Zend/tests/stack_limit/stack_limit_011.phpt
index 3c5daf59f6b..6155525675c 100644
--- a/Zend/tests/stack_limit/stack_limit_011.phpt
+++ b/Zend/tests/stack_limit/stack_limit_011.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Stack limit 011 - Stack limit exhaustion during unwinding
+--SKIPIF--
+<?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
+?>
 --EXTENSIONS--
 zend_test
 --INI--
diff --git a/Zend/tests/stack_limit/stack_limit_012.phpt b/Zend/tests/stack_limit/stack_limit_012.phpt
index c4920a928d6..ed5189f37ca 100644
--- a/Zend/tests/stack_limit/stack_limit_012.phpt
+++ b/Zend/tests/stack_limit/stack_limit_012.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Stack limit 012 - Stack limit exhaustion during unwinding
+--SKIPIF--
+<?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
+?>
 --EXTENSIONS--
 zend_test
 --INI--