Fix: processing memory/table.grow also on non-validating runs

Author: arjunr2

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

@@ -4,7 +4,10 @@ use crate::rr::FlatBytes;
 #[cfg(feature = "rr")]
 use crate::rr::{
     RREvent, RRFuncArgVals, RRFuncArgValsConvertable, ReplayError, Replayer, ResultEvent, Validate,
-    common_events::{HostFuncEntryEvent, HostFuncReturnEvent, MemoryGrowEvent, TableGrowEvent, WasmFuncReturnEvent},
+    common_events::{
+        HostFuncEntryEvent, HostFuncReturnEvent, MemoryGrowEvent, TableGrowEvent,
+        WasmFuncReturnEvent,
+    },
     core_events::{InstantiationEvent, WasmFuncEntryEvent},
 };
 use crate::store::{InstanceId, StoreOpaque};
@@ -217,34 +220,30 @@ pub fn record_and_replay_validate_instantiation<T: 'static>(
 
 /// Record and replay hook for memory.grow return value
 #[inline]
-pub fn record_and_replay_validate_memory_grow(
-    result: u32,
-    store: &mut StoreOpaque,
-) -> Result<()> {
+pub fn record_and_replay_validate_memory_grow(result: u32, store: &mut StoreOpaque) -> Result<()> {
     let _ = (result, &store);
     #[cfg(feature = "rr")]
     {
         store.record_event(|| MemoryGrowEvent { result })?;
-        store.next_replay_event_validation::<MemoryGrowEvent, _, _>(|| MemoryGrowEvent {
-            result,
-        })?;
+        if let Some(buf) = store.replay_buffer_mut() {
+            buf.next_event_typed::<MemoryGrowEvent>()?
+                .validate(&MemoryGrowEvent { result })?;
+        }
     }
     Ok(())
 }
 
 /// Record and replay hook for table.grow return value
 #[inline]
-pub fn record_and_replay_validate_table_grow(
-    result: u32,
-    store: &mut StoreOpaque,
-) -> Result<()> {
+pub fn record_and_replay_validate_table_grow(result: u32, store: &mut StoreOpaque) -> Result<()> {
     let _ = (result, &store);
     #[cfg(feature = "rr")]
     {
         store.record_event(|| TableGrowEvent { result })?;
-        store.next_replay_event_validation::<TableGrowEvent, _, _>(|| TableGrowEvent {
-            result,
-        })?;
+        if let Some(buf) = store.replay_buffer_mut() {
+            buf.next_event_typed::<TableGrowEvent>()?
+                .validate(&TableGrowEvent { result })?;
+        }
     }
     Ok(())
 }