Skip to content

Commit 80778f6

Browse files
committed
Revert "rustc: Make bottom types immediates. Add a |log ret| testcase. Closes #935."
This reverts commit f19ab1f.
1 parent 31c04a5 commit 80778f6

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/comp/middle/trans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4306,7 +4306,7 @@ fn with_out_method(work: fn(out_method) -> result, cx: @block_ctxt,
43064306
// immediate-ness of the type.
43074307
fn type_is_immediate(ccx: @crate_ctxt, t: ty::t) -> bool {
43084308
ret ty::type_is_scalar(ccx.tcx, t) || ty::type_is_boxed(ccx.tcx, t) ||
4309-
ty::type_is_native(ccx.tcx, t) || ty::type_is_bot(ccx.tcx, t);
4309+
ty::type_is_native(ccx.tcx, t);
43104310
}
43114311

43124312
fn do_spill(cx: @block_ctxt, v: ValueRef, t: ty::t) -> result {

src/test/run-pass/log-ret.rs

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)