---

yaml
---
r: 7324
b: refs/heads/master
c: d673f76
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 394a80cfd8eac555dc006f645496195207fb8879
+refs/heads/master: d673f76fdf39143f81f842471088d50a80f37dcb

trunk/Makefile.in

@@ -397,7 +397,7 @@ rustc-stage3: rustc-stage3-H-$(CFG_HOST_TRIPLE)
 define DEF_RUSTC_TARGET
 # $(1) == architecture
 
-rustc-H-$(1): rustc-stage2-H-$(1)
+rustc-H-$(1): rustc-stage3-H-$(1)
 endef
 
 $(foreach host,$(CFG_TARGET_TRIPLES),			\

trunk/mk/install.mk

@@ -14,7 +14,7 @@ else
 endif
 
 # The stage we install from
-ISTAGE = 2
+ISTAGE = 3
 
 PREFIX_ROOT = $(CFG_PREFIX)
 PREFIX_BIN = $(PREFIX_ROOT)/bin
@@ -56,7 +56,6 @@ install: all install-host install-targets
 
 # Shorthand for build/stageN/bin
 HB = $(HBIN$(ISTAGE)_H_$(CFG_HOST_TRIPLE))
-HB3 = $(HBIN3_H_$(CFG_HOST_TRIPLE))
 # Shorthand for build/stageN/lib
 HL = $(HLIB$(ISTAGE)_H_$(CFG_HOST_TRIPLE))
 # Shorthand for the prefix bin directory
@@ -68,9 +67,9 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
 	$(Q)mkdir -p $(PREFIX_BIN)
 	$(Q)mkdir -p $(PREFIX_LIB)
 	$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
-	$(Q)$(call INSTALL,$(HB3),$(PHB),rustc$(X))
-	$(Q)$(call INSTALL,$(HB3),$(PHB),cargo$(X))
-	$(Q)$(call INSTALL,$(HB3),$(PHB),rustdoc$(X))
+	$(Q)$(call INSTALL,$(HB),$(PHB),rustc$(X))
+	$(Q)$(call INSTALL,$(HB),$(PHB),cargo$(X))
+	$(Q)$(call INSTALL,$(HB),$(PHB),rustdoc$(X))
 	$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))

trunk/mk/tests.mk

@@ -70,7 +70,7 @@ endif
 # Main test targets
 ######################################################################
 
-check: all tidy check-stage2 \
+check: all tidy check-stage3 \
 
 check-full: all tidy check-stage1 check-stage2 check-stage3 \
 

trunk/src/comp/middle/trans.rs

@@ -4463,14 +4463,10 @@ fn trans_closure(cx: @local_ctxt, sp: span, decl: ast::fn_decl,
     // translation calls that don't have a return value (trans_crate,
     // trans_mod, trans_item, et cetera) and those that do
     // (trans_block, trans_expr, et cetera).
-    if ty::type_is_bot(cx.ccx.tcx, block_ty) ||
-       ty::type_is_nil(cx.ccx.tcx, block_ty) ||
-       option::is_none(body.node.expr) {
-        bcx = trans_block_dps(bcx, body, ignore);
-    } else if ty::type_is_immediate(cx.ccx.tcx, block_ty) {
-        let cell = empty_dest_cell();
-        bcx = trans_block_dps(bcx, body, by_val(cell));
-        Store(bcx, *cell, fcx.llretptr);
+    if option::is_none(body.node.expr) ||
+       ty::type_is_bot(cx.ccx.tcx, block_ty) ||
+       ty::type_is_nil(cx.ccx.tcx, block_ty) {
+        bcx = trans_block(bcx, body);
     } else {
         bcx = trans_block_dps(bcx, body, save_in(fcx.llretptr));
     }