Skip to content

Commit

Permalink
Fix an ICE when a function argument is of the bottom type
Browse files Browse the repository at this point in the history
Fixes #13352
  • Loading branch information
Jakub Wieczorek committed Jun 4, 2014
1 parent 6d3e89e commit b9752b6
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/callee.rs
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ pub fn trans_arg_datum<'a>(
// "undef" value, as such a value should never
// be inspected. It's important for the value
// to have type lldestty (the callee's expected type).
let llformal_arg_ty = type_of::type_of(ccx, formal_arg_ty);
let llformal_arg_ty = type_of::type_of_explicit_arg(ccx, formal_arg_ty);
unsafe {
val = llvm::LLVMGetUndef(llformal_arg_ty.to_ref());
}
Expand Down
21 changes: 21 additions & 0 deletions src/test/run-pass/issue-13352.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2014 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.

extern crate libc;

fn foo(_: proc()) {}

fn main() {
foo(loop {
unsafe { libc::exit(0 as libc::c_int); }
});
2u + (loop {});
-(loop {});
}

5 comments on commit b9752b6

@bors
Copy link
Contributor

@bors bors commented on b9752b6 Jun 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on b9752b6 Jun 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging jakub-/rust/infinite-loop-unreachable = b9752b6 into auto

@bors
Copy link
Contributor

@bors bors commented on b9752b6 Jun 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jakub-/rust/infinite-loop-unreachable = b9752b6 merged ok, testing candidate = bb57e41

@bors
Copy link
Contributor

@bors bors commented on b9752b6 Jun 5, 2014

@bors
Copy link
Contributor

@bors bors commented on b9752b6 Jun 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = bb57e41

Please sign in to comment.