rename BoundsCheck variants

Author: fitzgen

crates/cranelift/src/bounds_checks.rs

@@ -44,9 +44,9 @@ pub enum BoundsCheck {
     /// Check that this one access in particular is in bounds:
     ///
     /// ```ignore
-    /// index + offset + access_size <= gc_heap_bound
+    /// index + offset + access_size <= bound
     /// ```
-    Field { offset: u32, access_size: u8 },
+    StaticOffset { offset: u32, access_size: u8 },
 
     /// Assuming the precondition `offset + access_size <= object_size`, check
     /// that this whole object is in bounds:
@@ -55,7 +55,7 @@ pub enum BoundsCheck {
     /// index + object_size <= bound
     /// ```
     #[cfg(feature = "gc")]
-    StaticWholeObject {
+    StaticObjectField {
         offset: u32,
         access_size: u8,
         object_size: u32,
@@ -66,7 +66,7 @@ pub enum BoundsCheck {
     /// It is *your* responsibility to ensure that the `offset + access_size <=
     /// object_size` precondition holds.
     #[cfg(feature = "gc")]
-    DynamicWholeObject {
+    DynamicObjectField {
         offset: ir::Value,
         object_size: ir::Value,
     },
@@ -87,13 +87,13 @@ pub fn bounds_check_and_compute_addr(
     trap: ir::TrapCode,
 ) -> Reachability<ir::Value> {
     match bounds_check {
-        BoundsCheck::Field {
+        BoundsCheck::StaticOffset {
             offset,
             access_size,
         } => bounds_check_field_access(builder, env, heap, index, offset, access_size, trap),
 
         #[cfg(feature = "gc")]
-        BoundsCheck::StaticWholeObject {
+        BoundsCheck::StaticObjectField {
             offset,
             access_size,
             object_size,
@@ -131,7 +131,7 @@ pub fn bounds_check_and_compute_addr(
         // a pointer to just after the object, and then reverse offset from that
         // to get the pointer to the field being accessed.
         #[cfg(feature = "gc")]
-        BoundsCheck::DynamicWholeObject {
+        BoundsCheck::DynamicObjectField {
             offset,
             object_size,
         } => {

crates/cranelift/src/func_environ/gc/enabled.rs

@@ -328,7 +328,7 @@ pub fn translate_struct_get(
     let field_addr = func_env.prepare_gc_ref_access(
         builder,
         struct_ref,
-        BoundsCheck::StaticWholeObject {
+        BoundsCheck::StaticObjectField {
             offset: field_offset,
             access_size: u8::try_from(field_size).unwrap(),
             object_size: struct_size,
@@ -375,7 +375,7 @@ pub fn translate_struct_set(
     let field_addr = func_env.prepare_gc_ref_access(
         builder,
         struct_ref,
-        BoundsCheck::StaticWholeObject {
+        BoundsCheck::StaticObjectField {
             offset: field_offset,
             access_size: u8::try_from(field_size).unwrap(),
             object_size: struct_size,
@@ -643,7 +643,7 @@ pub fn translate_array_fill(
     let elem_addr = func_env.prepare_gc_ref_access(
         builder,
         array_ref,
-        BoundsCheck::DynamicWholeObject {
+        BoundsCheck::DynamicObjectField {
             offset: obj_offset,
             object_size: obj_size,
         },
@@ -691,7 +691,7 @@ pub fn translate_array_len(
         array_ref,
         // Note: We can't bounds check the whole array object's size because we
         // don't know its length yet. Chicken and egg problem.
-        BoundsCheck::Field {
+        BoundsCheck::StaticOffset {
             offset: len_offset,
             access_size: u8::try_from(ir::types::I32.bytes()).unwrap(),
         },
@@ -825,7 +825,7 @@ fn array_elem_addr(
     func_env.prepare_gc_ref_access(
         builder,
         array_ref,
-        BoundsCheck::DynamicWholeObject {
+        BoundsCheck::DynamicObjectField {
             offset: offset_in_array,
             object_size: obj_size,
         },
@@ -999,7 +999,7 @@ pub fn translate_ref_test(
         let kind_addr = func_env.prepare_gc_ref_access(
             builder,
             val,
-            BoundsCheck::StaticWholeObject {
+            BoundsCheck::StaticObjectField {
                 offset: wasmtime_environ::VM_GC_HEADER_KIND_OFFSET,
                 access_size: wasmtime_environ::VM_GC_KIND_SIZE,
                 object_size: wasmtime_environ::VM_GC_HEADER_SIZE,
@@ -1051,7 +1051,7 @@ pub fn translate_ref_test(
             let ty_addr = func_env.prepare_gc_ref_access(
                 builder,
                 val,
-                BoundsCheck::Field {
+                BoundsCheck::StaticOffset {
                     offset: wasmtime_environ::VM_GC_HEADER_TYPE_INDEX_OFFSET,
                     access_size: func_env.offsets.size_of_vmshared_type_index(),
                 },

crates/cranelift/src/func_environ/gc/enabled/drc.rs

@@ -32,7 +32,7 @@ impl DrcCompiler {
         let pointer = func_env.prepare_gc_ref_access(
             builder,
             gc_ref,
-            BoundsCheck::Field {
+            BoundsCheck::StaticOffset {
                 offset,
                 access_size: u8::try_from(ir::types::I64.bytes()).unwrap(),
             },
@@ -57,7 +57,7 @@ impl DrcCompiler {
         let pointer = func_env.prepare_gc_ref_access(
             builder,
             gc_ref,
-            BoundsCheck::Field {
+            BoundsCheck::StaticOffset {
                 offset,
                 access_size: u8::try_from(ir::types::I64.bytes()).unwrap(),
             },

crates/cranelift/src/translate/code_translator.rs

@@ -71,7 +71,7 @@
 //!   <https://github.com/bytecodealliance/cranelift/pull/1236>
 //!     ("Relax verification to allow I8X16 to act as a default vector type")
 
-use crate::bounds_checks::bounds_check_and_compute_addr;
+use crate::bounds_checks::{bounds_check_and_compute_addr, BoundsCheck};
 use crate::func_environ::{Extension, FuncEnvironment};
 use crate::translate::environ::{GlobalVariable, StructFieldsVec};
 use crate::translate::state::{ControlStackFrame, ElseData, FuncTranslationState};
@@ -3207,7 +3207,7 @@ fn prepare_addr(
             environ,
             &heap,
             index,
-            crate::bounds_checks::BoundsCheck::Field {
+            BoundsCheck::StaticOffset {
                 offset,
                 access_size,
             },
@@ -3255,7 +3255,7 @@ fn prepare_addr(
                 environ,
                 &heap,
                 adjusted_index,
-                crate::bounds_checks::BoundsCheck::Field {
+                BoundsCheck::StaticOffset {
                     offset: 0,
                     access_size,
                 },