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

Merge data alignment

Browse Source
This commit is contained in:
bjorn3
2019-04-24 19:58:16 +02:00
committed by Benjamin Bouvier
parent 8216b83c65
commit abf0048972
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cranelift/module/src/module.rs
View File

@@ -203,9 +203,10 @@ impl<B> ModuleData<B>
where where
B: Backend, B: Backend,
{ {
fn merge(&mut self, linkage: Linkage, writable: bool) { fn merge(&mut self, linkage: Linkage, writable: bool, align: Option<u8>) {
self.decl.linkage = Linkage::merge(self.decl.linkage, linkage); self.decl.linkage = Linkage::merge(self.decl.linkage, linkage);
self.decl.writable = self.decl.writable || writable; self.decl.writable = self.decl.writable || writable;
self.decl.align = self.decl.align.max(align);
} }
} }
@@ -447,7 +448,7 @@ where
Occupied(entry) => match *entry.get() { Occupied(entry) => match *entry.get() {
FuncOrDataId::Data(id) => { FuncOrDataId::Data(id) => {
let existing = &mut self.contents.data_objects[id]; let existing = &mut self.contents.data_objects[id];
existing.merge(linkage, writable); existing.merge(linkage, writable, align);
self.backend.declare_data( self.backend.declare_data(
name, name,
existing.decl.linkage, existing.decl.linkage,