diff options
| author | Marijn Haverbeke <marijnh@gmail.com> | 2011-09-21 11:05:54 +0200 |
|---|---|---|
| committer | Marijn Haverbeke <marijnh@gmail.com> | 2011-09-21 11:05:54 +0200 |
| commit | 07eb29dbce6d1da301ce9a0d499e3e2237fa986d (patch) | |
| tree | 020b75a25809ce8baa339a6b336cde1d138e4d5b /src | |
| parent | ce0f054f9d56df4e60291fc2e1b89ce979cf374f (diff) | |
| download | rust-07eb29dbce6d1da301ce9a0d499e3e2237fa986d.tar.gz rust-07eb29dbce6d1da301ce9a0d499e3e2237fa986d.zip | |
Revert "rustc: Make bottom types immediates. Add a |log ret| testcase. Closes #935."
This reverts commit e6a84f252ab7a016dd923adbf31e8c86deab1d72.
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp/middle/trans.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/log-ret.rs | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 5cadc2cb405..7d190ad89b1 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -4303,7 +4303,7 @@ fn with_out_method(work: fn(out_method) -> result, cx: @block_ctxt, // immediate-ness of the type. fn type_is_immediate(ccx: @crate_ctxt, t: ty::t) -> bool { ret ty::type_is_scalar(ccx.tcx, t) || ty::type_is_boxed(ccx.tcx, t) || - ty::type_is_native(ccx.tcx, t) || ty::type_is_bot(ccx.tcx, t); + ty::type_is_native(ccx.tcx, t); } fn do_spill(cx: @block_ctxt, v: ValueRef, t: ty::t) -> result { diff --git a/src/test/run-pass/log-ret.rs b/src/test/run-pass/log-ret.rs deleted file mode 100644 index c35bf94a71b..00000000000 --- a/src/test/run-pass/log-ret.rs +++ /dev/null @@ -1,5 +0,0 @@ -// xfail-test - -fn f() { log ret; } -fn main() { f(); } - |