Pass Module to UnwindContext

Once writing the LSDA, it will need access to the Module to get a
reference to the personality function and to define a data object for
the LSDA.
Part of rust-lang/rustc_codegen_cranelift#1567

Author: bjorn3

src/debuginfo/unwind.rs

@@ -1,7 +1,6 @@
 //! Unwind info generation (`.eh_frame`)
 
 use cranelift_codegen::ir::Endianness;
-use cranelift_codegen::isa::TargetIsa;
 use cranelift_codegen::isa::unwind::UnwindInfo;
 use cranelift_object::ObjectProduct;
 use gimli::RunTimeEndian;
@@ -18,14 +17,14 @@ pub(crate) struct UnwindContext {
 }
 
 implUnwindContext{
-pub(crate)fnnew(isa:&dynTargetIsa,pic_eh_frame:bool) -> Self{
-let endian = match isa.endianness(){
+pub(crate)fnnew(module:&mutdynModule,pic_eh_frame:bool) -> Self{
+let endian = matchmodule.isa().endianness(){
 Endianness::Little => RunTimeEndian::Little,
 Endianness::Big => RunTimeEndian::Big,
 };
 letmut frame_table = FrameTable::default();
 
-let cie_id = ifletSome(mut cie) = isa.create_systemv_cie(){
+let cie_id = ifletSome(mut cie) = module.isa().create_systemv_cie(){
 if pic_eh_frame {
  cie.fde_address_encoding =
  gimli::DwEhPe(gimli::DW_EH_PE_pcrel.0 | gimli::DW_EH_PE_sdata4.0);
@@ -38,8 +37,15 @@ impl UnwindContext {
 UnwindContext{ endian, frame_table, cie_id }
 }
 
-pub(crate)fnadd_function(&mutself,func_id:FuncId,context:&Context,isa:&dynTargetIsa){
-iflet target_lexicon::OperatingSystem::MacOSX{ .. } = isa.triple().operating_system{
+pub(crate)fnadd_function(
+&mutself,
+module:&mutdynModule,
+func_id:FuncId,
+context:&Context,
+){
+iflet target_lexicon::OperatingSystem::MacOSX{ .. } =
+ module.isa().triple().operating_system
+{
 // The object crate doesn't currently support DW_GNU_EH_PE_absptr, which macOS
 // requires for unwinding tables. In addition on arm64 it currently doesn't
 // support 32bit relocations as we currently use for the unwinding table.
@@ -48,7 +54,7 @@ impl UnwindContext {
 }
 
 let unwind_info = ifletSome(unwind_info) =
- context.compiled_code().unwrap().create_unwind_info(isa).unwrap()
+ context.compiled_code().unwrap().create_unwind_info(module.isa()).unwrap()
 {
  unwind_info
 }else{

src/unwind_module.rs

@@ -17,8 +17,8 @@ pub(crate) struct UnwindModule<T> {
 }
 
 impl<T:Module>UnwindModule<T>{
-pub(crate)fnnew(module:T,pic_eh_frame:bool) -> Self{
-let unwind_context = UnwindContext::new(module.isa(), pic_eh_frame);
+pub(crate)fnnew(mutmodule:T,pic_eh_frame:bool) -> Self{
+let unwind_context = UnwindContext::new(&mutmodule, pic_eh_frame);
 UnwindModule{ module, unwind_context }
 }
 }
@@ -37,7 +37,7 @@ impl UnwindModule<cranelift_jit::JITModule> {
 self.module.finalize_definitions().unwrap();
 let prev_unwind_context = std::mem::replace(
 &mutself.unwind_context,
-UnwindContext::new(self.module.isa(),false),
+UnwindContext::new(&mutself.module,false),
 );
 unsafe{ prev_unwind_context.register_jit(&self.module)};
 }
@@ -94,7 +94,7 @@ impl<T: Module> Module for UnwindModule<T> {
 ctrl_plane:&mutControlPlane,
 ) -> ModuleResult<()>{
 self.module.define_function_with_control_plane(func, ctx, ctrl_plane)?;
-self.unwind_context.add_function(func, ctx,self.module.isa());
+self.unwind_context.add_function(&mutself.module, func, ctx);
 Ok(())
 }