about summary refs log tree commit diff
path: root/src/librustc/ty
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2018-12-15 11:29:52 +0100
committerOliver Scherer <github35764891676564198441@oli-obk.de>2019-01-01 20:05:02 +0100
commitcb933eff350d9ebf81ee31511f54c99e99ab509f (patch)
treecc70007130609d22fe598153af9f0c353f39f6f6 /src/librustc/ty
parent089c4039c62caecf0bc58ef0672ab85de26e6186 (diff)
downloadrust-cb933eff350d9ebf81ee31511f54c99e99ab509f.tar.gz
rust-cb933eff350d9ebf81ee31511f54c99e99ab509f.zip
rebase fallout
Diffstat (limited to 'src/librustc/ty')
-rw-r--r--src/librustc/ty/context.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index 108fcc1bd3f..dfeab9715cc 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -1745,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)))
     }
 }