From 31d0a5815c43b219eca356d0cc7dfedfb0569eca Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Thu, 8 May 2025 18:53:12 +0200 Subject: [PATCH] Get rid of useless SHAPE_MASK --- shape.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shape.h b/shape.h index 8ec962ce2c..cbf021a712 100644 --- a/shape.h +++ b/shape.h @@ -25,14 +25,13 @@ typedef uint32_t redblack_id_t; #define SHAPE_MAX_FIELDS (attr_index_t)(-1) -# define SHAPE_MASK (((uintptr_t)1 << SHAPE_ID_NUM_BITS) - 1) # define SHAPE_FLAG_MASK (((VALUE)-1) >> SHAPE_ID_NUM_BITS) # define SHAPE_FLAG_SHIFT ((SIZEOF_VALUE * 8) - SHAPE_ID_NUM_BITS) # define SHAPE_MAX_VARIATIONS 8 -# define INVALID_SHAPE_ID SHAPE_MASK +# define INVALID_SHAPE_ID (((uintptr_t)1 << SHAPE_ID_NUM_BITS) - 1) #define ROOT_SHAPE_ID 0x0 #define SPECIAL_CONST_SHAPE_ID 0x1 @@ -95,7 +94,7 @@ static inline shape_id_t get_shape_id_from_flags(VALUE obj) { RUBY_ASSERT(!RB_SPECIAL_CONST_P(obj)); - return (shape_id_t)(SHAPE_MASK & ((RBASIC(obj)->flags) >> SHAPE_FLAG_SHIFT)); + return (shape_id_t)((RBASIC(obj)->flags) >> SHAPE_FLAG_SHIFT); } static inline void