about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2017-04-29 05:28:14 -0400
committerNiko Matsakis <niko@alum.mit.edu>2017-05-02 14:01:36 -0400
commitd9c8a2b54b2eca0aaf9a0642b89a0ba1af6d8d78 (patch)
treeef8af3223afc1f5dfe30cc3c49c13416589bb82d
parent0d045d73a75420a9a2b3e93df01aaf40a1104738 (diff)
downloadrust-d9c8a2b54b2eca0aaf9a0642b89a0ba1af6d8d78.tar.gz
rust-d9c8a2b54b2eca0aaf9a0642b89a0ba1af6d8d78.zip
use `force` to ensure const-qualif has been done, not read
-rw-r--r--src/librustc_mir/transform/qualify_consts.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index 8fc264ac1d4..c2d2e113f56 100644
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -946,8 +946,9 @@ impl DefIdPass for QualifyAndPromoteConstants {
                 // Ensure that we compute the `mir_const_qualif` for
                 // constants at this point, before we do any further
                 // optimization (and before we steal the previous
-                // MIR).
-                tcx.mir_const_qualif(mir_cx.def_id());
+                // MIR). We don't directly need the result, so we can
+                // just force it.
+                ty::queries::mir_const_qualif::force(tcx, DUMMY_SP, mir_cx.def_id());
                 mir_cx.steal_previous_mir()
             }