Fix missing exit call during merge

Author: arjunr2

crates/wasmtime/src/runtime/component/func/host.rs

@@ -371,6 +371,7 @@ where
         unsafe {
             flags.set_may_leave(true);
         }
+        lower.exit_call()?;
     }
 
     return Ok(());

crates/wasmtime/src/runtime/rr/core.rs

@@ -603,7 +603,7 @@ mod tests {
             RecordBuffer::new_recorder(Box::new(File::create(tmppath)?), record_settings)?;
 
         record_fn(&mut recorder)?;
-        recorder.flush()?;
+        drop(recorder);
 
         let tmp = tmp.into_temp_path();
         let tmppath = <TempPath as AsRef<Path>>::as_ref(&tmp)

crates/wasmtime/src/runtime/rr/replay_driver.rs

@@ -287,7 +287,10 @@ impl<T: 'static> ReplayInstance<T> {
                 }
             }
 
-            _ => Err(ReplayError::IncorrectEventVariant)?,
+            _ => {
+                log::error!("Unexpected non-top-level RR event: {:?}", rr_event);
+                Err(ReplayError::IncorrectEventVariant)?
+            }
         }
         Ok(())
     }
@@ -445,7 +448,10 @@ impl<T: 'static> ReplayInstance<T> {
                 }
             }
 
-            _ => Err(ReplayError::IncorrectEventVariant)?,
+            _ => {
+                log::error!("Unexpected non-top-level RR event: {:?}", rr_event);
+                Err(ReplayError::IncorrectEventVariant)?
+            }
         }
         Ok(())
     }