about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Wieczorek <jakub@jakub.cc>2014-06-04 18:25:30 +0200
committerJakub Wieczorek <jakub@jakub.cc>2014-06-04 18:38:02 +0200
commitb9752b68ae8b95ca323ac11d9659de6b6cb701f5 (patch)
tree9a065bcad634525e7df36fdc831971a9588b3296
parent6d3e89e33cfd7517eb9f4068ce38f9e1b14a664f (diff)
downloadrust-b9752b68ae8b95ca323ac11d9659de6b6cb701f5.tar.gz
rust-b9752b68ae8b95ca323ac11d9659de6b6cb701f5.zip
Fix an ICE when a function argument is of the bottom type
Fixes #13352
-rw-r--r--src/librustc/middle/trans/callee.rs2
-rw-r--r--src/test/run-pass/issue-13352.rs21
2 files changed, 22 insertions, 1 deletions
diff --git a/src/librustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs
index 1659ecaecd8..b5cf3fb8e73 100644
--- a/src/librustc/middle/trans/callee.rs
+++ b/src/librustc/middle/trans/callee.rs
@@ -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());
         }
diff --git a/src/test/run-pass/issue-13352.rs b/src/test/run-pass/issue-13352.rs
new file mode 100644
index 00000000000..f0477817281
--- /dev/null
+++ b/src/test/run-pass/issue-13352.rs
@@ -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 {});
+}