From 80778f642fb7f4084c6ad6efd7e9605f381e881a Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Wed, 21 Sep 2011 21:39:31 +0200 Subject: [PATCH] Revert "rustc: Make bottom types immediates. Add a |log ret| testcase. Closes #935." This reverts commit f19ab1ff3c85973a54cc98e3f98ae240e2d0d816. --- src/comp/middle/trans.rs | 2 +- src/test/run-pass/log-ret.rs | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 src/test/run-pass/log-ret.rs diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index a2830d65f5a..0f48df3bdbd 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -4306,7 +4306,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(); } -