1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of useless SHAPE_MASK

Browse Source
This commit is contained in:
Jean Boussier 2025-05-08 18:53:12 +02:00
parent 334ebba221
commit 31d0a5815c
Notes: git 2025-05-09 08:23:11 +00:00 
Merged: https://github.com/ruby/ruby/pull/13283
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shape.h
View File

@ -25,14 +25,13 @@ typedef uint32_t redblack_id_t;
#define SHAPE_MAX_FIELDS (attr_index_t)(-1) #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_MASK (((VALUE)-1) >> SHAPE_ID_NUM_BITS)
# define SHAPE_FLAG_SHIFT ((SIZEOF_VALUE * 8) - SHAPE_ID_NUM_BITS) # define SHAPE_FLAG_SHIFT ((SIZEOF_VALUE * 8) - SHAPE_ID_NUM_BITS)
# define SHAPE_MAX_VARIATIONS 8 # 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 ROOT_SHAPE_ID 0x0
#define SPECIAL_CONST_SHAPE_ID 0x1 #define SPECIAL_CONST_SHAPE_ID 0x1
@ -95,7 +94,7 @@ static inline shape_id_t
get_shape_id_from_flags(VALUE obj) get_shape_id_from_flags(VALUE obj)
{ {
RUBY_ASSERT(!RB_SPECIAL_CONST_P(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 static inline void