bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit '35d9c6bf25' into sync_cg_clif-2022-02-23

Browse source
This commit is contained in:
bjorn3 2022-02-23 11:49:34 +01:00
commit f596dce542
24 changed files with 843 additions and 809 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_codegen_cranelift/src/allocator.rs
View file

@ -3,7 +3,6 @@
use crate::prelude::*;
use cranelift_codegen::binemit::{NullStackMapSink, NullTrapSink};
use rustc_ast::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
/// Returns whether an allocator shim was created
@ -91,9 +90,7 @@ fn codegen_inner(
bcx.seal_all_blocks();
bcx.finalize();
}
module
.define_function(func_id, &mut ctx, &mut NullTrapSink {}, &mut NullStackMapSink {})
.unwrap();
module.define_function(func_id, &mut ctx).unwrap();
unwind_context.add_function(func_id, &ctx, module.isa());
}
@ -130,8 +127,6 @@ fn codegen_inner(
bcx.seal_all_blocks();
bcx.finalize();
}
module
.define_function(func_id, &mut ctx, &mut NullTrapSink {}, &mut NullStackMapSink {})
.unwrap();
module.define_function(func_id, &mut ctx).unwrap();
unwind_context.add_function(func_id, &ctx, module.isa());
}