From 6a5afdd9654adc73ba413414573227700dc82feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= <john.kare.alsaker@gmail.com>
Date: Thu, 27 Jun 2019 06:41:06 +0200
Subject: [PATCH] Store const_eval_raw results to disk

---
 src/librustc/query/mod.rs              | 1 -
 src/librustc/ty/query/on_disk_cache.rs | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/librustc/query/mod.rs b/src/librustc/query/mod.rs
index d2082ab87e738..85b1e91ee35c8 100644
--- a/src/librustc/query/mod.rs
+++ b/src/librustc/query/mod.rs
@@ -424,7 +424,6 @@ rustc_queries! {
             }
             cache_on_disk_if(_, opt_result) {
                 // Only store results without errors
-                // FIXME: We never store these
                 opt_result.map_or(true, |r| r.is_ok())
             }
         }
diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs
index 8b2183c42efd4..336caa391e40e 100644
--- a/src/librustc/ty/query/on_disk_cache.rs
+++ b/src/librustc/ty/query/on_disk_cache.rs
@@ -221,8 +221,8 @@ impl<'sess> OnDiskCache<'sess> {
                 encode_query_results::<check_match<'_>, _>(tcx, enc, qri)?;
                 encode_query_results::<codegen_fn_attrs<'_>, _>(tcx, enc, qri)?;
                 encode_query_results::<specialization_graph_of<'_>, _>(tcx, enc, qri)?;
+                encode_query_results::<const_eval_raw<'_>, _>(tcx, enc, qri)?;
                 encode_query_results::<const_eval<'_>, _>(tcx, enc, qri)?;
-                // FIXME: Include const_eval_raw?
 
                 Ok(())
             })?;