Skip to content

Commit 78a6edc

Browse files
dotdashthestinger
authored andcommitted
---
yaml --- r: 64691 b: refs/heads/snap-stage3 c: 7fbe800 h: refs/heads/master i: 64689: 12130ad 64687: 5b186cc v: v3
1 parent cc569ae commit 78a6edc

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 254339fd3974417999147ac6c4f23c80e7ad8ab4
4+
refs/heads/snap-stage3: 7fbe8002d515b8f8730fc6502a767719854af3d8
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/foreign.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,9 @@ pub fn trans_intrinsic(ccx: @mut CrateContext,
805805
_ => Ret(bcx, BitCast(bcx, llsrcval, llouttype))
806806
}
807807
}
808+
} else if ty::type_is_immediate(ccx.tcx, out_type) {
809+
let llsrcptr = PointerCast(bcx, llsrcval, llouttype.ptr_to());
810+
Ret(bcx, Load(bcx, llsrcptr));
808811
} else {
809812
// NB: Do not use a Load and Store here. This causes massive
810813
// code bloat when `transmute` is used on large structural
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Issue #7988
12+
// Transmuting non-immediate type to immediate type
13+
14+
fn main() {
15+
unsafe {
16+
std::cast::transmute::<[int,..1],int>([1])
17+
};
18+
}

0 commit comments

Comments
 (0)