about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2018-12-27 15:21:47 +0100
committerOliver Scherer <github35764891676564198441@oli-obk.de>2019-01-01 20:05:03 +0100
commit48aa81911ceafbddfe1db90ec287aafa31047576 (patch)
treecc70007130609d22fe598153af9f0c353f39f6f6 /src
parent3d924a6252ee65c1cfe518c9cdc63870e3e62eed (diff)
downloadrust-48aa81911ceafbddfe1db90ec287aafa31047576.tar.gz
rust-48aa81911ceafbddfe1db90ec287aafa31047576.zip
what is going on?
Diffstat (limited to 'src')
-rw-r--r--src/librustc/ty/context.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index ce9be4e8405..dfeab9715cc 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -1730,7 +1730,12 @@ impl<'a, 'tcx> Lift<'tcx> for Region<'a> {
         if tcx.interners.arena.in_arena(*self as *const _) {
             return Some(unsafe { mem::transmute(*self) });
         }
-        Some(tcx.intern_const_alloc(mir::interpret::Allocation::clone(self)))
+        // Also try in the global tcx if we're not that.
+        if !tcx.is_global() {
+            self.lift_to_tcx(tcx.global_tcx())
+        } else {
+            None
+        }
     }
 }
 
@@ -1740,12 +1745,7 @@ impl<'a, 'tcx> Lift<'tcx> for Goal<'a> {
         if tcx.interners.arena.in_arena(*self as *const _) {
             return Some(unsafe { mem::transmute(*self) });
         }
-        // Also try in the global tcx if we're not that.
-        if !tcx.is_global() {
-            self.lift_to_tcx(tcx.global_tcx())
-        } else {
-            None
-        }
+        Some(tcx.intern_const_alloc(mir::interpret::Allocation::clone(self)))
     }
 }