From ff6dd5c24b0da35d5ad1e0e20082f3d62b74b190 Mon Sep 17 00:00:00 2001
From: Garming Sam <garming_sam@outlook.com>
Date: Sat, 6 Jun 2015 15:19:15 +1200
Subject: [PATCH] Avoid change to current module on escape from callback

---
 src/librustc_resolve/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index b6e9619129ba..d89fd635c7ac 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -2624,9 +2624,8 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
         visit::walk_block(self, block);
 
         // Move back up.
-        self.current_module = orig_module;
-
         if !self.resolved {
+            self.current_module = orig_module;
             self.value_ribs.pop();
         }
         debug!("(resolving block) leaving block");