Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-08 23:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix unsafe AtomicRefCell<PersistentLayoutData> transmute due to memory alignment differences

Browse source
This commit is contained in:
Imanol Fernandez 2017-05-12 12:17:58 +02:00
parent 48fdda3f07
commit 593e89086f
6 changed files with 39 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/layout/Cargo.toml
View file

@ -10,4 +10,6 @@ path = "lib.rs"
doctest = false
[dependencies]
atomic_refcell = "0.1"
layout = {path = "../../../components/layout"}
script_layout_interface = {path = "../../../components/script_layout_interface"}

26
tests/unit/layout/align_of.rs Normal file
View file

@ -0,0 +1,26 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use atomic_refcell::AtomicRefCell;
use layout::PersistentLayoutData;
use script_layout_interface::PartialPersistentLayoutData;
use std::mem::align_of;
fn check_layout_alignment(expected: usize, current: usize) {
if current != expected {
panic!("Your changes have altered the mem alignment of the PartialPersistentLayoutData \
struct to {}, but it must match the {}-alignment of PersistentLayoutData struct. \
Please fix alignment in components/script_layout_interface/lib.rs",
current, expected);
}
}
#[test]
fn test_persistent_layout_data_alignment() {
check_layout_alignment(align_of::<PersistentLayoutData>(),
align_of::<PartialPersistentLayoutData>());
check_layout_alignment(align_of::<AtomicRefCell<PersistentLayoutData>>(),
align_of::<AtomicRefCell<PartialPersistentLayoutData>>());
}

3
tests/unit/layout/lib.rs
View file

@ -2,6 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
extern crate atomic_refcell;
extern crate layout;
extern crate script_layout_interface;
#[cfg(test)] mod align_of;
#[cfg(all(test, target_pointer_width = "64"))] mod size_of;