diff --git a/cranelift/faerie/src/backend.rs b/cranelift/faerie/src/backend.rs index 372655f1df..047ddeb87d 100644 --- a/cranelift/faerie/src/backend.rs +++ b/cranelift/faerie/src/backend.rs @@ -339,9 +339,20 @@ fn translate_data_linkage(linkage: Linkage, writable: bool, align: Option) - let align = align.map(|align| usize::from(align)); match linkage { Linkage::Import => faerie::Decl::data_import().into(), - Linkage::Local => faerie::Decl::data().with_writable(writable).with_align(align).into(), - Linkage::Export => faerie::Decl::data().global().with_writable(writable).with_align(align).into(), - Linkage::Preemptible => faerie::Decl::data().weak().with_writable(writable).with_align(align).into(), + Linkage::Local => faerie::Decl::data() + .with_writable(writable) + .with_align(align) + .into(), + Linkage::Export => faerie::Decl::data() + .global() + .with_writable(writable) + .with_align(align) + .into(), + Linkage::Preemptible => faerie::Decl::data() + .weak() + .with_writable(writable) + .with_align(align) + .into(), } } diff --git a/cranelift/module/src/module.rs b/cranelift/module/src/module.rs index 9eac603a28..7451e2fda4 100644 --- a/cranelift/module/src/module.rs +++ b/cranelift/module/src/module.rs @@ -448,8 +448,12 @@ where FuncOrDataId::Data(id) => { let existing = &mut self.contents.data_objects[id]; existing.merge(linkage, writable); - self.backend - .declare_data(name, existing.decl.linkage, existing.decl.writable, existing.decl.align); + self.backend.declare_data( + name, + existing.decl.linkage, + existing.decl.writable, + existing.decl.align, + ); Ok(id) }