mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-08-30 20:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Force jump tables to be for local functions

Browse Source
This commit is contained in:
Syrus
2020-05-02 04:49:57 -07:00
parent deace5beb0
commit e3d77dcf8a
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/compiler-cranelift/src/compiler.rs
View File

@ -31,7 +31,7 @@ pub struct RelocSink<'a> {
module: &'a Module,
/// Current function index.
func_index: FuncIndex,
local_func_index: LocalFuncIndex,
/// Relocations recorded for the function.
pub func_relocs: Vec<Relocation>,
@ -87,7 +87,10 @@ impl<'a> binemit::RelocSink for RelocSink<'a> {
fn reloc_jt(&mut self, offset: binemit::CodeOffset, reloc: binemit::Reloc, jt: ir::JumpTable) {
self.func_relocs.push(Relocation {
kind: irreloc_to_relocationkind(reloc),
reloc_target: RelocationTarget::JumpTable(self.func_index, JumpTable::new(jt.index())),
reloc_target: RelocationTarget::JumpTable(
self.local_func_index,
JumpTable::new(jt.index()),
),
offset,
addend: 0,
});
@ -97,9 +100,12 @@ impl<'a> binemit::RelocSink for RelocSink<'a> {
impl<'a> RelocSink<'a> {
/// Return a new `RelocSink` instance.
pub fn new(module: &'a Module, func_index: FuncIndex) -> Self {
let local_func_index = module
.local_func_index(func_index)
.expect("The provided function should be local");
Self {
module,
func_index,
local_func_index,
func_relocs: Vec::new(),
}
}