---

yaml
---
r: 12092
b: refs/heads/master
c: c56910f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1ffaedac2b222731bdf92a3b19bcb119809b2ba1
+refs/heads/master: c56910fc9ac5120d8637d6121753e4dc1670a390
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/ty.rs

@@ -666,14 +666,22 @@ fn fold_ty(cx: ctxt, fld: fold_mode, ty_0: t) -> t {
             ty = mk_tup(cx, new_ts);
           }
           ty_fn(f) {
-            let mut new_args: [arg] = [];
-            for a: arg in f.inputs {
-                let new_ty = do_fold(cx, fld, a.ty, under_rptr);
-                new_args += [{mode: a.mode, ty: new_ty}];
+            alt fld {
+              fm_rptr(_) {
+                // Don't recurse into functions, because regions are
+                // universally quantified, well, universally, at function
+                // boundaries.
+              }
+              _ {
+                let mut new_args: [arg] = [];
+                for a: arg in f.inputs {
+                    let new_ty = do_fold(cx, fld, a.ty, under_rptr);
+                    new_args += [{mode: a.mode, ty: new_ty}];
+                }
+                let new_output = do_fold(cx, fld, f.output, under_rptr);
+                ty = mk_fn(cx, {inputs: new_args, output: new_output with f});
+              }
             }
-            ty = mk_fn(cx, {inputs: new_args,
-                            output: do_fold(cx, fld, f.output, under_rptr)
-                            with f});
           }
           ty_res(did, subty, tps) {
             let mut new_tps = [];