Skip to content

Commit bc7faf5

Browse files
committed
---
yaml --- r: 174398 b: refs/heads/auto c: 9c5173f h: refs/heads/master v: v3
1 parent 395620e commit bc7faf5

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 0859e5ebb319ceddcce01ddb63470d8f59860aba
13+
refs/heads/auto: 9c5173f8e5444862471eb079c93801ff13d4d525
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc_trans/trans/intrinsic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ pub fn trans_intrinsic_call<'a, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
362362
(_, "init") => {
363363
let tp_ty = *substs.types.get(FnSpace, 0);
364364
if !return_type_is_void(ccx, tp_ty) {
365-
// Just zero out the stack slot
365+
// Just zero out the stack slot. (See comment on base::memzero for explaination)
366366
zero_mem(bcx, llresult, tp_ty);
367367
}
368368
C_nil(ccx)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2015 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+
// Makes sure that zero-initializing large types is reasonably fast,
12+
// Doing it incorrectly causes massive slowdown in LLVM during
13+
// optimisation.
14+
15+
#![feature(intrinsics)]
16+
17+
extern "rust-intrinsic" {
18+
pub fn init<T>() -> T;
19+
}
20+
21+
const SIZE: usize = 512 * 1024 * 1024;
22+
23+
fn main() {
24+
let _memory: [u8; SIZE] = unsafe { init() };
25+
}

0 commit comments

Comments
 (0)