Auto merge of rust-lang#772 - emilio:ff, r=fitzgen

codegen: Inline {read,write}_unaligned in order to support rust 1.15.

Author: bors-servo

Cargo.lock

@@ -13,7 +13,7 @@ name = "bindgen"
 readme = "README.md"
 repository = "https://github.com/servo/rust-bindgen"
 documentation = "https://docs.rs/bindgen"
-version = "0.26.0"
+version = "0.26.1"
 build = "build.rs"
 
 exclude = [

Cargo.toml

@@ -1286,12 +1286,19 @@ impl<'a> FieldCodegen<'a> for Bitfield {
             impl XxxIgnored {
                 #[inline]
                 pub fn $getter_name(&self) -> $bitfield_ty {
-                    let mask = $mask as $unit_field_int_ty;
-                    let unit_field_val: $unit_field_int_ty = unsafe {
-                        ::$prefix::ptr::read_unaligned(
-                            &self.$unit_field_ident as *const _ as *const $unit_field_int_ty
+                    let mut unit_field_val: $unit_field_int_ty = unsafe {
+                        ::$prefix::mem::uninitialized()
+                    };
+
+                    unsafe {
+                        ::$prefix::ptr::copy_nonoverlapping(
+                            &self.$unit_field_ident as *const _ as *const u8,
+                            &mut unit_field_val as *mut $unit_field_int_ty as *mut u8,
+                            ::$prefix::mem::size_of::<$unit_field_int_ty>(),
                         )
                     };
+
+                    let mask = $mask as $unit_field_int_ty;
                     let val = (unit_field_val & mask) >> $offset;
                     unsafe {
                         ::$prefix::mem::transmute(val as $bitfield_int_ty)
@@ -1304,17 +1311,25 @@ impl<'a> FieldCodegen<'a> for Bitfield {
                     let val = val as $bitfield_int_ty as $unit_field_int_ty;
 
                     let mut unit_field_val: $unit_field_int_ty = unsafe {
-                        ::$prefix::ptr::read_unaligned(
-                            &self.$unit_field_ident as *const _ as *const $unit_field_int_ty)
+                        ::$prefix::mem::uninitialized()
+                    };
+
+                    unsafe {
+                        ::$prefix::ptr::copy_nonoverlapping(
+                            &self.$unit_field_ident as *const _ as *const u8,
+                            &mut unit_field_val as *mut $unit_field_int_ty as *mut u8,
+                            ::$prefix::mem::size_of::<$unit_field_int_ty>(),
+                        )
                     };
 
                     unit_field_val &= !mask;
                     unit_field_val |= (val << $offset) & mask;
 
                     unsafe {
-                        ::$prefix::ptr::write_unaligned(
-                            &mut self.$unit_field_ident as *mut _ as *mut $unit_field_int_ty,
-                            unit_field_val
+                        ::$prefix::ptr::copy_nonoverlapping(
+                            &unit_field_val as *const _ as *const u8,
+                            &mut self.$unit_field_ident as *mut _ as *mut u8,
+                            ::$prefix::mem::size_of::<$unit_field_int_ty>(),
                         );
                     }
                 }