Skip to content

Commit

Permalink
Auto merge of #36508 - nagisa:llvm-backport, r=eddyb
Browse files Browse the repository at this point in the history
Up the LLVM

Fixes #36474

The relevant patch to rust-llvm is at rust-lang/llvm#51

r? @alexcrichton
  • Loading branch information
bors authored Sep 17, 2016
2 parents fb62f4d + d104e5b commit 32571c0
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/llvm
2 changes: 1 addition & 1 deletion src/rustllvm/llvm-auto-clean-trigger
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
# The actual contents of this file do not matter, but to trigger a change on the
# build bots then the contents should be changed so git updates the mtime.
2016-08-30
2016-09-17
40 changes: 40 additions & 0 deletions src/test/run-pass/issue-36474.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Copyright 2016 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.

fn main() {
remove_axis(&3, 0);
}

trait Dimension {
fn slice(&self) -> &[usize];
}

impl Dimension for () {
fn slice(&self) -> &[usize] { &[] }
}

impl Dimension for usize {
fn slice(&self) -> &[usize] {
unsafe {
::std::slice::from_raw_parts(self, 1)
}
}
}

fn remove_axis(value: &usize, axis: usize) -> () {
let tup = ();
let mut it = tup.slice().iter();
for (i, _) in value.slice().iter().enumerate() {
if i == axis {
continue;
}
it.next();
}
}

0 comments on commit 32571c0

Please sign in to comment.