---

yaml
---
r: 38820
b: refs/heads/incoming
c: bf792b9
h: refs/heads/master
v: v3

Author: vertexclique

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 17a5d0f3a0a76e172777456cc0f5ed8318149e33
+refs/heads/incoming: bf792b922cb14ed7825246f169d60874f71aec78
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/mk/tests.mk

@@ -93,22 +93,22 @@ cleantestlibs:
          | xargs rm -rf
 
 check: cleantestlibs cleantmptestlogs tidy all check-stage2
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
+	$(Q)$(S)src/etc/check-summary.py tmp/*.log
 
 check-notidy: cleantestlibs cleantmptestlogs all check-stage2
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
+	$(Q)$(S)src/etc/check-summary.py tmp/*.log
 
 check-full: cleantestlibs cleantmptestlogs tidy \
             all check-stage1 check-stage2 check-stage3
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
+	$(Q)$(S)src/etc/check-summary.py tmp/*.log
 
 check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
+	$(Q)$(S)src/etc/check-summary.py tmp/*.log
 
 check-lite: cleantestlibs cleantmptestlogs rustc-stage2 \
 	check-stage2-core check-stage2-std check-stage2-rpass \
 	check-stage2-rfail check-stage2-cfail
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
+	$(Q)$(S)src/etc/check-summary.py tmp/*.log
 
 # Run the tidy script in multiple parts to avoid huge 'echo' commands
 ifdef CFG_NOTIDY

branches/incoming/src/rustc/middle/trans/datum.rs

@@ -542,6 +542,25 @@ impl Datum {
         };
     }
 
+    fn dropnzero_val(bcx: block) -> block {
+        if !ty::type_needs_drop(bcx.tcx(), self.ty) {
+            return bcx;
+        }
+
+        return match self.mode {
+            ByRef => {
+                glue::drop_ty(bcx, self.val, self.ty);
+                zero_mem(bcx, self.val, self.ty);
+                return bcx;
+            }
+            ByValue => {
+                glue::drop_ty_immediate(bcx, self.val, self.ty);
+                zero_mem(bcx, self.val, self.ty);
+                return bcx;
+            }
+        };
+    }
+
     fn box_body(bcx: block) -> Datum {
         /*!
          *

branches/incoming/src/rustc/middle/trans/expr.rs

@@ -573,7 +573,7 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
             if bcx.expr_is_lval(a) {
                 let datum = unpack_datum!(bcx, trans_to_datum(bcx, a));
                 return match dest {
-                    Ignore => datum.drop_val(bcx),
+                    Ignore => datum.dropnzero_val(bcx),
                     SaveIn(addr) => datum.move_to(bcx, INIT, addr)
                 };
             } else {