Fix a crash when transmuting non-immediate to immediate types
The code to build the transmute intrinsic currently makes the invalid assumption that if the in-type is non-immediate, the out-type is non-immediate as well. But this is wrong, for example when transmuting [int, ..1] to int. So we need to handle this fourth case as well. Fixes #7988
This commit is contained in:
parent
254339fd39
commit
7fbe8002d5
2 changed files with 21 additions and 0 deletions
|
@ -805,6 +805,9 @@ pub fn trans_intrinsic(ccx: @mut CrateContext,
|
||||||
_ => Ret(bcx, BitCast(bcx, llsrcval, llouttype))
|
_ => Ret(bcx, BitCast(bcx, llsrcval, llouttype))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if ty::type_is_immediate(ccx.tcx, out_type) {
|
||||||
|
let llsrcptr = PointerCast(bcx, llsrcval, llouttype.ptr_to());
|
||||||
|
Ret(bcx, Load(bcx, llsrcptr));
|
||||||
} else {
|
} else {
|
||||||
// NB: Do not use a Load and Store here. This causes massive
|
// NB: Do not use a Load and Store here. This causes massive
|
||||||
// code bloat when `transmute` is used on large structural
|
// code bloat when `transmute` is used on large structural
|
||||||
|
|
18
src/test/run-pass/transmute-non-immediate-to-immediate.rs
Normal file
18
src/test/run-pass/transmute-non-immediate-to-immediate.rs
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
// Issue #7988
|
||||||
|
// Transmuting non-immediate type to immediate type
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
unsafe {
|
||||||
|
std::cast::transmute::<[int,..1],int>([1])
|
||||||
|
};
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue