diff options
| author | bors <bors@rust-lang.org> | 2017-12-03 05:14:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-03 05:14:24 +0000 |
| commit | 7e251390c782d5b8d94c6e55c83572a3a7a26cb4 (patch) | |
| tree | 363a9b1d7e3ec91e0f9b2844749d88b61a9cf7f0 /src/test/codegen | |
| parent | 16ba4591d7294e16d5fd5ea1fe8dd604f77ddd4e (diff) | |
| parent | d4559554454e8dc6eff2b7002baff2a5372e3dda (diff) | |
| download | rust-7e251390c782d5b8d94c6e55c83572a3a7a26cb4.tar.gz rust-7e251390c782d5b8d94c6e55c83572a3a7a26cb4.zip | |
Auto merge of #46428 - eddyb:scalar-pair-unpacking, r=arielb1
rustc: don't unpack newtypes of scalar-pairs with mismatched alignment. This PR fixes a potential problem where a packed newtype of a pair was also considered a pair, even though it didn't have the required alignment of the pair. cc @oli-obk It's possible miri hit something like this, with an unstable feature, but it's more general.
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/packed.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/test/codegen/packed.rs b/src/test/codegen/packed.rs index dd530cf03cd..022f581278c 100644 --- a/src/test/codegen/packed.rs +++ b/src/test/codegen/packed.rs @@ -57,3 +57,14 @@ pub fn pkd_pair(pair1: &mut PackedPair, pair2: &mut PackedPair) { // CHECK: call void @llvm.memcpy.{{.*}}(i8* %{{.*}}, i8* %{{.*}}, i{{[0-9]+}} 5, i32 1, i1 false) *pair2 = *pair1; } + +#[repr(packed)] +#[derive(Copy, Clone)] +pub struct PackedNestedPair((u32, u32)); + +// CHECK-LABEL: @pkd_nested_pair +#[no_mangle] +pub fn pkd_nested_pair(pair1: &mut PackedNestedPair, pair2: &mut PackedNestedPair) { +// CHECK: call void @llvm.memcpy.{{.*}}(i8* %{{.*}}, i8* %{{.*}}, i{{[0-9]+}} 8, i32 1, i1 false) + *pair2 = *pair1; +} |