diff options
| author | lukaslueg <lukas.lueg@gmail.com> | 2021-04-06 18:23:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 18:23:21 +0200 |
| commit | 72796a7c36d60cd5d32e181dd0fca924399c2a03 (patch) | |
| tree | 157b3a3527632082291a2c17b39d22ab5395cfe1 /compiler/rustc_codegen_cranelift/src/allocator.rs | |
| parent | 7f32fda78c60bb5b05e610a1c0c0fecaff07f497 (diff) | |
| parent | 5c897d430dcbec6b10a9925f7de054dbc0ad3c52 (diff) | |
| download | rust-72796a7c36d60cd5d32e181dd0fca924399c2a03.tar.gz rust-72796a7c36d60cd5d32e181dd0fca924399c2a03.zip | |
Merge branch 'master' into stab_peek_mut
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src/allocator.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/allocator.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/allocator.rs b/compiler/rustc_codegen_cranelift/src/allocator.rs index efb64233ef2..f60645a9f97 100644 --- a/compiler/rustc_codegen_cranelift/src/allocator.rs +++ b/compiler/rustc_codegen_cranelift/src/allocator.rs @@ -3,6 +3,7 @@ use crate::prelude::*; +use cranelift_codegen::binemit::{NullStackMapSink, NullTrapSink}; use rustc_ast::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS}; use rustc_span::symbol::sym; @@ -92,7 +93,7 @@ fn codegen_inner( bcx.finalize(); } module - .define_function(func_id, &mut ctx, &mut cranelift_codegen::binemit::NullTrapSink {}) + .define_function(func_id, &mut ctx, &mut NullTrapSink {}, &mut NullStackMapSink {}) .unwrap(); unwind_context.add_function(func_id, &ctx, module.isa()); } @@ -132,7 +133,7 @@ fn codegen_inner( bcx.finalize(); } module - .define_function(func_id, &mut ctx, &mut cranelift_codegen::binemit::NullTrapSink {}) + .define_function(func_id, &mut ctx, &mut NullTrapSink {}, &mut NullStackMapSink {}) .unwrap(); unwind_context.add_function(func_id, &ctx, module.isa()); } |