---

yaml
---
r: 6448
b: refs/heads/master
c: acbc4aa
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8dd52ed3649d2dba3474a80254d1cc5180797f3
+refs/heads/master: acbc4aa9f8f46545c8c11422c62b392e3ef64cf5

trunk/src/comp/middle/trans_common.rs

@@ -297,14 +297,8 @@ fn revoke_clean(cx: @block_ctxt, val: ValueRef) {
         }
         i += 1;
     }
-    // The value does not have a cleanup associated with it. Continue to next
-    // scope.
-    if found == -1 {
-        alt sc_cx.parent {
-          parent_some(parent) { revoke_clean(parent, val); } _ {}
-        }
-        ret;
-    }
+    // The value does not have a cleanup associated with it.
+    if found == -1 { ret; }
     // We found the cleanup and remove it
     sc_cx.cleanups =
         std::vec::slice(sc_cx.cleanups, 0u, found as uint) +