about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-02-15 09:45:48 +0100
committerGitHub <noreply@github.com>2020-02-15 09:45:48 +0100
commit09d6a657b1396d8ed9ce052df4a45d4ef47fa608 (patch)
tree3cec0a048d7d02d17c656feb8f21cd9f7d2b0aed
parentc115ad927a2dc24400de60dc280a9e7029b9bd44 (diff)
parentbe92200af7ac732063500a96890ed0354dcc490b (diff)
downloadrust-09d6a657b1396d8ed9ce052df4a45d4ef47fa608.tar.gz
rust-09d6a657b1396d8ed9ce052df4a45d4ef47fa608.zip
Rollup merge of #69166 - JohnTitor:ice-const-enum, r=matthewjasper
Check `has_typeck_tables` before calling `typeck_tables_of`

Fixes #68684

r? @matthewjasper
-rw-r--r--src/librustc_mir/const_eval/eval_queries.rs5
-rw-r--r--src/test/ui/consts/issue-68684.rs15
2 files changed, 19 insertions, 1 deletions
diff --git a/src/librustc_mir/const_eval/eval_queries.rs b/src/librustc_mir/const_eval/eval_queries.rs
index 2e8e4dac237..4fdabed54b8 100644
--- a/src/librustc_mir/const_eval/eval_queries.rs
+++ b/src/librustc_mir/const_eval/eval_queries.rs
@@ -288,7 +288,10 @@ pub fn const_eval_raw_provider<'tcx>(
     let cid = key.value;
     let def_id = cid.instance.def.def_id();
 
-    if def_id.is_local() && tcx.typeck_tables_of(def_id).tainted_by_errors {
+    if def_id.is_local()
+        && tcx.has_typeck_tables(def_id)
+        && tcx.typeck_tables_of(def_id).tainted_by_errors
+    {
         return Err(ErrorHandled::Reported);
     }
 
diff --git a/src/test/ui/consts/issue-68684.rs b/src/test/ui/consts/issue-68684.rs
new file mode 100644
index 00000000000..c98f199b60e
--- /dev/null
+++ b/src/test/ui/consts/issue-68684.rs
@@ -0,0 +1,15 @@
+// check-pass
+
+enum _Enum {
+    A(),
+}
+
+type _E = _Enum;
+
+const fn _a() -> _Enum {
+    _E::A()
+}
+
+const _A: _Enum = _a();
+
+fn main() {}