Updated orca_wasm into wirm latest version #300
Conversation
| let mut table_instr_idx = 0usize; | ||
| let mut delta: i32 = 0; | ||
| { | ||
| let ops_ro = builder.body.instructions.get_ops(); |
There was a problem hiding this comment.
I think you should be able to revert the changes to this loop and instead change instructions.iter_mut() to instructions.get_ops().iter_mut() in (the original) line 762.
There was a problem hiding this comment.
builder.body.instructions.get_ops() returns an immutable reference so you can't use iter_mut() on it
There was a problem hiding this comment.
Ah, right. There's a get_ops_mut() that should hopefully work, though
There was a problem hiding this comment.
get_ops_mut panics if there are flags on the Instructions, and there are flags
| } | ||
| } | ||
| builder.inject_at( | ||
| // Inject adjustments after the located instruction: add delta and add arg index |
There was a problem hiding this comment.
Why doesn't the inject_at approach work here anymore? Maybe you just couldn't find it anymore because it moved into the InjectAt trait? If you change the use wirm::opcode::Inject; statement to use wirm::opcode::{Inject, InjectAt}; I think the original code should work as before.
There was a problem hiding this comment.
Yeah I totally missed the InjectAt, added it back but the other code is necessary to set the instruction as it can't be done in the loop for the reason in the previous comment
| let mut table_instr_idx = 0usize; | ||
| let mut delta: i32 = 0; | ||
| { | ||
| let ops_ro = builder.body.instructions.get_ops(); |
There was a problem hiding this comment.
Ah, right. There's a get_ops_mut() that should hopefully work, though
3 participants
Split from #298