diff options
| author | Emilio Cobos Álvarez <emilio@crisal.io> | 2018-03-31 04:25:52 +0200 |
|---|---|---|
| committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2018-04-03 11:27:46 +0200 |
| commit | 473cfc29ff0b5a6a8f268d8a3069ffe9502edf90 (patch) | |
| tree | 6882db8d9cc8af0c54f4ff070ddadde99ae7611e /src/codegen/mod.rs | |
| parent | 96bba97e7b8fff36d7b0151b5fea9ac5c4e0f3bf (diff) | |
codegen: Use target pointer size consistently for layout calculations.
Closes #1284
Diffstat (limited to 'src/codegen/mod.rs')
| -rw-r--r-- | src/codegen/mod.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 5e104360..5411b2a0 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -45,7 +45,6 @@ use std::collections::{HashSet, VecDeque}; use std::collections::hash_map::{Entry, HashMap}; use std::fmt::Write; use std::iter; -use std::mem; use std::ops; // Name of type defined in constified enum module @@ -1777,7 +1776,7 @@ impl CodeGenerator for CompInfo { let align = layout.align; let check_struct_align = - if align > mem::size_of::<*mut ()>() { + if align > ctx.target_pointer_size() { // FIXME when [RFC 1358](https://github.com/rust-lang/rust/issues/33626) ready None } else { @@ -2720,9 +2719,8 @@ trait TryToOpaque { /// leverage the blanket impl for this trait. trait ToOpaque: TryToOpaque { fn get_layout(&self, ctx: &BindgenContext, extra: &Self::Extra) -> Layout { - self.try_get_layout(ctx, extra).unwrap_or_else( - |_| Layout::for_size(1), - ) + self.try_get_layout(ctx, extra) + .unwrap_or_else(|_| Layout::for_size(ctx, 1)) } fn to_opaque( |