Merge pull request #1466 from peterhuene/fix-unwind-emit

Refactor unwind generation in Cranelift.

crates/api/src/trampoline/func.rs

@@ -10,9 +10,7 @@ use std::mem;
 use std::panic::{self, AssertUnwindSafe};
 use wasmtime_environ::entity::PrimaryMap;
 use wasmtime_environ::isa::TargetIsa;
-use wasmtime_environ::{
-    ir, settings, CompiledFunction, CompiledFunctionUnwindInfo, Export, Module,
-};
+use wasmtime_environ::{ir, settings, CompiledFunction, Export, Module};
 use wasmtime_jit::trampoline::ir::{
     ExternalName, Function, InstBuilder, MemFlags, StackSlotData, StackSlotKind,
 };
@@ -112,7 +110,6 @@ fn make_trampoline(
 
     let mut context = Context::new();
     context.func = Function::with_name_signature(ExternalName::user(0, 0), signature.clone());
-    context.func.collect_frame_layout_info();
 
     let ss = context.func.create_stack_slot(StackSlotData::new(
         StackSlotKind::ExplicitSlot,
@@ -188,9 +185,10 @@ fn make_trampoline(
         .map_err(|error| pretty_error(&context.func, Some(isa), error))
         .expect("compile_and_emit");
 
-    let unwind_info = CompiledFunctionUnwindInfo::new(isa, &context)
+    let unwind_info = context
+        .create_unwind_info(isa)
         .map_err(|error| pretty_error(&context.func, Some(isa), error))
-        .expect("emit unwind info");
+        .expect("create unwind information");
 
     code_memory
         .allocate_for_function(&CompiledFunction {
@@ -251,7 +249,7 @@ pub fn create_handle_with_function(
     // Next up we wrap everything up into an `InstanceHandle` by publishing our
     // code memory (makes it executable) and ensuring all our various bits of
     // state make it into the instance constructors.
-    code_memory.publish();
+    code_memory.publish(isa.as_ref());
     let trampoline_state = TrampolineState { func, code_memory };
     create_handle(
         module,