OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trans: don't forget to cast Pair constants of the wrong type.

Browse Source
This commit is contained in:
Eduard Burtescu 2016-06-07 02:21:58 +03:00
parent b6d9f8387a
commit 11e31091a9
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_trans/mir/constant.rs
View File

@ -122,10 +122,10 @@ impl<'tcx> Const<'tcx> {
let llty = type_of::immediate_type_of(ccx, self.ty);
let llvalty = val_ty(self.llval);
let val = if common::type_is_imm_pair(ccx, self.ty) {
let val = if llty == llvalty && common::type_is_imm_pair(ccx, self.ty) {
let (a, b) = self.get_pair();
OperandValue::Pair(a, b)
} else if common::type_is_immediate(ccx, self.ty) && llty == llvalty {
} else if llty == llvalty && common::type_is_immediate(ccx, self.ty) {
// If the types match, we can use the value directly.
OperandValue::Immediate(self.llval)
} else {

14
src/test/run-pass/mir_constval_adts.rs
View File

@ -15,21 +15,23 @@ struct Point {
_y: i32,
}
#[derive(PartialEq, Eq, Debug)]
struct Newtype<T>(T);
const STRUCT: Point = Point { _x: 42, _y: 42 };
const TUPLE1: (i32, i32) = (42, 42);
const TUPLE2: (&'static str, &'static str) = ("hello","world");
const PAIR_NEWTYPE: (Newtype<i32>, Newtype<i32>) = (Newtype(42), Newtype(42));
#[rustc_mir]
fn mir() -> (Point, (i32, i32), (&'static str, &'static str)){
fn mir() -> (Point, (i32, i32), (&'static str, &'static str), (Newtype<i32>, Newtype<i32>)) {
let struct1 = STRUCT;
let tuple1 = TUPLE1;
let tuple2 = TUPLE2;
(struct1, tuple1, tuple2)
let pair_newtype = PAIR_NEWTYPE;
(struct1, tuple1, tuple2, pair_newtype)
}
#[derive(PartialEq, Eq, Debug)]
struct Newtype<T>(T);
const NEWTYPE: Newtype<&'static str> = Newtype("foobar");
#[rustc_mir]
@ -39,7 +41,7 @@ fn test_promoted_newtype_str_ref() {
}
fn main(){
assert_eq!(mir(), (STRUCT, TUPLE1, TUPLE2));
assert_eq!(mir(), (STRUCT, TUPLE1, TUPLE2, PAIR_NEWTYPE));
test_promoted_newtype_str_ref();
}