---

yaml
---
r: 31743
b: refs/heads/dist-snap
c: febd7ee
h: refs/heads/master
i:
  31741: 9c883d9
  31739: 8bf671a
  31735: 7bbbef4
  31727: 9901c02
  31711: 9052fef
  31679: 52d81e7
  31615: 91ec669
  31487: ef870a7
  31231: 1afb289
  30719: 6c92920
v: v3

Author: catamorphism

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: d99ca69cf7207e31d7ddffe849a4235cc63899d7
+refs/heads/dist-snap: febd7ee239c1182147317a0e31057a0e69e260ff
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/trans/base.rs

@@ -4206,9 +4206,26 @@ fn build_return(bcx: block) {
     Br(bcx, bcx.fcx.llreturn);
 }
 
+fn ignore_lhs(_bcx: block, local: @ast::local) -> bool {
+    match local.node.pat.node {
+        ast::pat_wild => true, _ => false
+    }
+}
+
 fn init_local(bcx: block, local: @ast::local) -> block {
     let _icx = bcx.insn_ctxt(~"init_local");
     let ty = node_id_type(bcx, local.node.id);
+
+    if ignore_lhs(bcx, local) {
+        // Handle let _ = e; just like e;
+        match local.node.init {
+            some(init) => {
+              return trans_expr(bcx, init.expr, ignore);
+            }
+            none => { return bcx; }
+        }
+    }
+
     let llptr = match bcx.fcx.lllocals.find(local.node.id) {
       some(local_mem(v)) => v,
       _ => { bcx.tcx().sess.span_bug(local.span,

branches/dist-snap/src/test/run-pass/issue-2735-2.rs

@@ -0,0 +1,14 @@
+// This test should behave exactly like issue-2735-3
+class defer {
+    let b: &mut bool;
+    new(b: &mut bool) {
+        self.b = b;
+    }   
+    drop { *(self.b) = true; }
+}
+
+fn main() {
+    let mut dtor_ran = false;
+    let _  = defer(&mut dtor_ran);
+    assert(dtor_ran);
+}

branches/dist-snap/src/test/run-pass/issue-2735-3.rs

@@ -0,0 +1,14 @@
+// This test should behave exactly like issue-2735-2
+class defer {
+    let b: &mut bool;
+    new(b: &mut bool) {
+        self.b = b;
+    }   
+    drop { *(self.b) = true; }
+}
+
+fn main() {
+    let mut dtor_ran = false;
+    defer(&mut dtor_ran);
+    assert(dtor_ran);
+}