Add asan functions

Author: trowski

Zend/zend_fibers.c

@@ -238,13 +238,15 @@ ZEND_API void zend_fiber_switch_context(zend_fiber_context *to) /* {{{ */
 }
 /* }}} */
 
-ZEND_API void zend_fiber_suspend_context(zend_fiber_context *current) /* {{{ */
+ZEND_API zend_fiber_context *zend_fiber_suspend_context(zend_fiber_context *current) /* {{{ */
 {
 	ZEND_ASSERT(current && current->caller && current->stack.pointer && "Invalid fiber context");
 
 	transfer_t transfer = jump_fcontext(current->caller, NULL);
 
 	current->caller = transfer.context;
+
+	return transfer.data;
 }
 /* }}} */
 
@@ -258,7 +260,16 @@ static void zend_fiber_suspend(zend_fiber *fiber) /* {{{ */
 
 	ZEND_FIBER_BACKUP_EG(stack, stack_page_size, execute_data, error_reporting, jit_trace_num);
 
-	zend_fiber_suspend_context(&fiber->context);
+#if defined(VARIANT_SANITIZE)
+	void *fake_stack = NULL;
+	__sanitizer_start_switch_fiber(&fake_stack, fiber->context->stack.pointer, fiber->context->stack.size);
+#endif
+
+	zend_fiber_context *from = zend_fiber_suspend_context(&fiber->context);
+
+#if defined(VARIANT_SANITIZE)
+	__sanitizer_finish_switch_fiber(&fake_stack, from->context->stack.pointer, from->context->stack.size);
+#endif
 
 	ZEND_FIBER_RESTORE_EG(stack, stack_page_size, execute_data, error_reporting, jit_trace_num);
 }
@@ -281,8 +292,17 @@ static void zend_fiber_switch_to(zend_fiber *fiber) /* {{{ */
 
 	EG(current_fiber) = fiber;
 
+#if defined(VARIANT_SANITIZE)
+	void *fake_stack = NULL;
+	__sanitizer_start_switch_fiber(&fake_stack, fiber->context->stack.pointer, fiber->context->stack.size);
+#endif
+
 	zend_fiber_switch_context(&fiber->context);
 
+#if defined(VARIANT_SANITIZE)
+	__sanitizer_finish_switch_fiber(fake_stack, NULL, NULL);
+#endif
+
 	EG(current_fiber) = previous;
 
 	ZEND_FIBER_RESTORE_EG(stack, stack_page_size, execute_data, error_reporting, jit_trace_num);

Zend/zend_fibers.h

@@ -130,7 +130,7 @@ ZEND_COLD ZEND_NORETURN void zend_error_suspend_fiber(
 		int orig_type, const char *error_filename, uint32_t error_lineno, zend_string *message);
 
 ZEND_API void zend_fiber_switch_context(zend_fiber_context *to);
-ZEND_API void zend_fiber_suspend_context(zend_fiber_context *current);
+ZEND_API zend_fiber_context *zend_fiber_suspend_context(zend_fiber_context *current);
 
 #define ZEND_FIBER_VM_STACK_SIZE (1024 * sizeof(zval))