From 147cc70dd649dd888385d0c3ac5fc8367965b4b9 Mon Sep 17 00:00:00 2001 From: Konstantinos Sofokleous Date: Wed, 16 Dec 2015 10:54:11 +0100 Subject: fix gpr_stack_lockfree_test assert bug on 64 bits --- src/core/support/stack_lockfree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/support/stack_lockfree.c b/src/core/support/stack_lockfree.c index df9a09894c..3cc1be3650 100644 --- a/src/core/support/stack_lockfree.c +++ b/src/core/support/stack_lockfree.c @@ -128,8 +128,8 @@ int gpr_stack_lockfree_push(gpr_stack_lockfree *stack, int entry) { gpr_atm old_val; old_val = gpr_atm_no_barrier_fetch_add(&stack->pushed[pushed_index], - (gpr_atm)(1UL << pushed_bit)); - GPR_ASSERT((old_val & (gpr_atm)(1UL << pushed_bit)) == 0); + ((gpr_atm)1 << pushed_bit)); + GPR_ASSERT((old_val & ((gpr_atm)1 << pushed_bit)) == 0); } #endif @@ -166,8 +166,8 @@ int gpr_stack_lockfree_pop(gpr_stack_lockfree *stack) { gpr_atm old_val; old_val = gpr_atm_no_barrier_fetch_add(&stack->pushed[pushed_index], - -(gpr_atm)(1UL << pushed_bit)); - GPR_ASSERT((old_val & (gpr_atm)(1UL << pushed_bit)) != 0); + -((gpr_atm)1 << pushed_bit)); + GPR_ASSERT((old_val & ((gpr_atm)1 << pushed_bit)) != 0); } #endif -- cgit v1.2.3 From 1ce471a670b475d6ba0b73c16271c604752a64af Mon Sep 17 00:00:00 2001 From: Konstantinos Sofokleous Date: Wed, 16 Dec 2015 16:50:09 +0100 Subject: fix indentation and be more explicit re cast to gpr_atm --- src/core/support/stack_lockfree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/support/stack_lockfree.c b/src/core/support/stack_lockfree.c index 3cc1be3650..fc934d404c 100644 --- a/src/core/support/stack_lockfree.c +++ b/src/core/support/stack_lockfree.c @@ -129,7 +129,7 @@ int gpr_stack_lockfree_push(gpr_stack_lockfree *stack, int entry) { old_val = gpr_atm_no_barrier_fetch_add(&stack->pushed[pushed_index], ((gpr_atm)1 << pushed_bit)); - GPR_ASSERT((old_val & ((gpr_atm)1 << pushed_bit)) == 0); + GPR_ASSERT((old_val & (((gpr_atm)1) << pushed_bit)) == 0); } #endif @@ -167,7 +167,7 @@ int gpr_stack_lockfree_pop(gpr_stack_lockfree *stack) { old_val = gpr_atm_no_barrier_fetch_add(&stack->pushed[pushed_index], -((gpr_atm)1 << pushed_bit)); - GPR_ASSERT((old_val & ((gpr_atm)1 << pushed_bit)) != 0); + GPR_ASSERT((old_val & (((gpr_atm)1) << pushed_bit)) != 0); } #endif -- cgit v1.2.3