diff options
| author | Katherine Oelsner <octokatherine@github.com> | 2023-10-18 14:05:48 -0700 |
|---|---|---|
| committer | John Hawthorn <john@hawthorn.email> | 2023-10-18 15:01:13 -0700 |
| commit | a7032b80af18b7f2eb3552c5231ca36a8c69f1be (patch) | |
| tree | 2a4fe0a060e061570061054c79b136373fb36d9e /yjit | |
| parent | de0764501987aff0f9b19594a2cbd5583ccce660 (diff) | |
| download | ruby-a7032b80af18b7f2eb3552c5231ca36a8c69f1be.tar.gz | |
Revert "shape.h: Make attr_index_t uint8_t"
This reverts commit e3afc212ec059525fe4e5387b2a3be920ffe0f0e.
Diffstat (limited to 'yjit')
| -rw-r--r-- | yjit/src/codegen.rs | 6 | ||||
| -rw-r--r-- | yjit/src/cruby_bindings.inc.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index 1636a4d74b..880338f88d 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -2264,7 +2264,7 @@ fn gen_get_ivar( let ivar_index = unsafe { let shape_id = comptime_receiver.shape_id_of(); let shape = rb_shape_get_shape_by_id(shape_id); - let mut ivar_index: u8 = 0; + let mut ivar_index: u32 = 0; if rb_shape_get_iv_index(shape, ivar_name, &mut ivar_index) { Some(ivar_index as usize) } else { @@ -2450,7 +2450,7 @@ fn gen_setinstancevariable( let ivar_index = if !shape_too_complex { let shape_id = comptime_receiver.shape_id_of(); let shape = unsafe { rb_shape_get_shape_by_id(shape_id) }; - let mut ivar_index: u8 = 0; + let mut ivar_index: u32 = 0; if unsafe { rb_shape_get_iv_index(shape, ivar_name, &mut ivar_index) } { Some(ivar_index as usize) } else { @@ -2717,7 +2717,7 @@ fn gen_definedivar( let shape_id = comptime_receiver.shape_id_of(); let ivar_exists = unsafe { let shape = rb_shape_get_shape_by_id(shape_id); - let mut ivar_index: u8 = 0; + let mut ivar_index: u32 = 0; rb_shape_get_iv_index(shape, ivar_name, &mut ivar_index) }; diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs index 3cc213ce83..ac70d4a334 100644 --- a/yjit/src/cruby_bindings.inc.rs +++ b/yjit/src/cruby_bindings.inc.rs @@ -588,7 +588,7 @@ pub const VM_ENV_FLAG_ESCAPED: vm_frame_env_flags = 4; pub const VM_ENV_FLAG_WB_REQUIRED: vm_frame_env_flags = 8; pub const VM_ENV_FLAG_ISOLATED: vm_frame_env_flags = 16; pub type vm_frame_env_flags = u32; -pub type attr_index_t = u8; +pub type attr_index_t = u32; pub type shape_id_t = u32; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -596,7 +596,7 @@ pub struct rb_shape { pub edges: *mut rb_id_table, pub edge_name: ID, pub next_iv_index: attr_index_t, - pub capacity: attr_index_t, + pub capacity: u32, pub type_: u8, pub size_pool_index: u8, pub parent_id: shape_id_t, |