T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cranelift: tweak condition in safepoint detection to check for resumable traps;

Browse Source
This commit is contained in:
Benjamin Bouvier
2020-06-12 19:22:06 +02:00
parent dad56a2488
commit 238ae3bf21
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cranelift/codegen/src/regalloc/safepoint.rs
View File

@@ -1,6 +1,6 @@
use crate::cursor::{Cursor, FuncCursor};
use crate::dominator_tree::DominatorTree;
use crate::ir::{Function, InstBuilder, InstructionData, Opcode, TrapCode};
use crate::ir::{Function, InstBuilder, Opcode};
use crate::isa::TargetIsa;
use crate::regalloc::live_value_tracker::LiveValueTracker;
use crate::regalloc::liveness::Liveness;
@@ -51,11 +51,7 @@ pub fn emit_stackmaps(
pos.goto_top(block);
while let Some(inst) = pos.next_inst() {
if let InstructionData::Trap {
code: TrapCode::Interrupt,
..
} = &pos.func.dfg[inst]
{
if pos.func.dfg[inst].opcode().is_resumable_trap() {
insert_and_encode_safepoint(&mut pos, tracker, isa);
} else if pos.func.dfg[inst].opcode().is_call() {
insert_and_encode_safepoint(&mut pos, tracker, isa);