From 5fb03758e57bc32dab7580217b17c58ca98b8d48 Mon Sep 17 00:00:00 2001 From: Aaron Piotrowski Date: Sat, 8 May 2021 13:12:06 -0500 Subject: [PATCH] Rename sanitizer members for clarity These members hold the prior stack pointer and size, so bottom and capacity were poor name choices, prior_pointer and prior_size are more clear. --- Zend/zend_fibers.c | 10 +++++----- Zend/zend_fibers.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c index 3167238c518..12e6158d6af 100644 --- a/Zend/zend_fibers.c +++ b/Zend/zend_fibers.c @@ -185,7 +185,7 @@ static ZEND_NORETURN void zend_fiber_trampoline(transfer_t transfer) zend_fiber_context *context = transfer.data; #ifdef __SANITIZE_ADDRESS__ - __sanitizer_finish_switch_fiber(NULL, &context->stack.bottom, &context->stack.capacity); + __sanitizer_finish_switch_fiber(NULL, &context->stack.prior_pointer, &context->stack.prior_size); #endif context->caller = transfer.context; @@ -195,7 +195,7 @@ static ZEND_NORETURN void zend_fiber_trampoline(transfer_t transfer) context->self = NULL; #ifdef __SANITIZE_ADDRESS__ - __sanitizer_start_switch_fiber(NULL, context->stack.bottom, context->stack.capacity); + __sanitizer_start_switch_fiber(NULL, context->stack.prior_pointer, context->stack.prior_size); #endif jump_fcontext(context->caller, NULL); @@ -242,7 +242,7 @@ ZEND_API void zend_fiber_switch_context(zend_fiber_context *to) transfer_t transfer = jump_fcontext(to->self, to); #ifdef __SANITIZE_ADDRESS__ - __sanitizer_finish_switch_fiber(fake_stack, &to->stack.bottom, &to->stack.capacity); + __sanitizer_finish_switch_fiber(fake_stack, &to->stack.prior_pointer, &to->stack.prior_size); #endif to->self = transfer.context; @@ -254,13 +254,13 @@ ZEND_API void zend_fiber_suspend_context(zend_fiber_context *current) #ifdef __SANITIZE_ADDRESS__ void *fake_stack; - __sanitizer_start_switch_fiber(&fake_stack, current->stack.bottom, current->stack.capacity); + __sanitizer_start_switch_fiber(&fake_stack, current->stack.prior_pointer, current->stack.prior_size); #endif transfer_t transfer = jump_fcontext(current->caller, NULL); #ifdef __SANITIZE_ADDRESS__ - __sanitizer_finish_switch_fiber(fake_stack, ¤t->stack.bottom, ¤t->stack.capacity); + __sanitizer_finish_switch_fiber(fake_stack, ¤t->stack.prior_pointer, ¤t->stack.prior_size); #endif current->caller = transfer.context; diff --git a/Zend/zend_fibers.h b/Zend/zend_fibers.h index 4c9cd0b8ba7..de1364d08ac 100644 --- a/Zend/zend_fibers.h +++ b/Zend/zend_fibers.h @@ -43,8 +43,8 @@ typedef struct _zend_fiber_stack { #endif #ifdef __SANITIZE_ADDRESS__ - const void *bottom; - size_t capacity; + const void *prior_pointer; + size_t prior_size; #endif } zend_fiber_stack;