Optimize: Remove interface type for lowering validation events

Author: arjunr2

crates/wasmtime/src/runtime/rr/backend/crimp.rs

@@ -162,10 +162,6 @@ rr_event! {
     ComponentInstantiation(component_events::InstantiationEvent),
     /// Component ABI realloc call in linear wasm memory
     ComponentReallocEntry(component_events::ReallocEntryEvent),
-    /// Return from a type lowering operation
-    ComponentLowerFlatReturn(component_events::LowerFlatReturnEvent),
-    /// Return from a store during a type lowering operation
-    ComponentLowerMemoryReturn(component_events::LowerMemoryReturnEvent),
     /// An attempt to obtain a mutable slice into Wasm linear memory
     ComponentMemorySliceWrite(component_events::MemorySliceWriteEvent),
     /// Return from a component builtin
@@ -185,6 +181,10 @@ rr_event! {
     ComponentLowerFlatEntry(component_events::LowerFlatEntryEvent),
     /// Call into type lowering for memory destination
     ComponentLowerMemoryEntry(component_events::LowerMemoryEntryEvent),
+    /// Return from a type lowering operation
+    ComponentLowerFlatReturn(component_events::LowerFlatReturnEvent),
+    /// Return from a store during a type lowering operation
+    ComponentLowerMemoryReturn(component_events::LowerMemoryReturnEvent),
     /// Call into a component builtin
     ComponentBuiltinEntry(component_events::BuiltinEntryEvent)
 }

crates/wasmtime/src/runtime/rr/backend/crimp/events/component_events.rs

@@ -58,14 +58,11 @@ pub struct ReallocEntryEvent {
 
 /// Entry to a type lowering invocation to flat destination.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct LowerFlatEntryEvent {
-    pub ty: InterfaceType,
-}
+pub struct LowerFlatEntryEvent;
 
 /// Entry to type lowering invocation to destination in memory.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct LowerMemoryEntryEvent {
-    pub ty: InterfaceType,
     pub offset: u64,
 }
 

crates/wasmtime/src/runtime/rr/hooks/component_hooks.rs

@@ -181,7 +181,6 @@ where
     cx.store
         .0
         .record_event_validation(|| LowerMemoryEntryEvent {
-            ty,
             offset: offset as u64,
         })?;
     let store_result = lower_store(cx, ty, offset);
@@ -203,9 +202,7 @@ where
     F: FnOnce(&mut LowerContext<'_, T>, InterfaceType) -> Result<()>,
 {
     #[cfg(feature = "rr")]
-    cx.store
-        .0
-        .record_event_validation(|| LowerFlatEntryEvent { ty })?;
+    cx.store.0.record_event_validation(|| LowerFlatEntryEvent)?;
     let lower_result = lower(cx, ty);
     #[cfg(feature = "rr")]
     cx.store.0.record_event_validation(|| {