about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-11-20 18:32:04 +0100
committerGitHub <noreply@github.com>2019-11-20 18:32:04 +0100
commite32397a75404d3e23701a727ebba753e391c1471 (patch)
treee0b1b353d1b6e6d185d96780fc85e92725ab8b57 /src/libsyntax
parentb9cf5417892ef242c783ef963deff5436205b0f6 (diff)
parente01d9415e26dfcdd31c182bec21049502f5477ff (diff)
downloadrust-e32397a75404d3e23701a727ebba753e391c1471.tar.gz
rust-e32397a75404d3e23701a727ebba753e391c1471.zip
Rollup merge of #66060 - traxys:test_65401, r=michaelwoerister
Making ICEs and test them in incremental

This adds:
 - A way to make the compiler ICE
 - A way to check for ICE in `cfail` tests with `should-ice`
 - A regression test for issue #65401

I am not sure the attribute added `should-ice` is the best for this job
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate/builtin_attrs.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs
index 57dae23f0dc..a13a4475ef0 100644
--- a/src/libsyntax/feature_gate/builtin_attrs.rs
+++ b/src/libsyntax/feature_gate/builtin_attrs.rs
@@ -543,7 +543,10 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
     rustc_attr!(TEST, rustc_variance, Normal, template!(Word)),
     rustc_attr!(TEST, rustc_layout, Normal, template!(List: "field1, field2, ...")),
     rustc_attr!(TEST, rustc_regions, Normal, template!(Word)),
-    rustc_attr!(TEST, rustc_error, Whitelisted, template!(Word)),
+    rustc_attr!(
+        TEST, rustc_error, Whitelisted,
+        template!(Word, List: "delay_span_bug_from_inside_query")
+    ),
     rustc_attr!(TEST, rustc_dump_user_substs, Whitelisted, template!(Word)),
     rustc_attr!(TEST, rustc_if_this_changed, Whitelisted, template!(Word, List: "DepNode")),
     rustc_attr!(TEST, rustc_then_this_would_need, Whitelisted, template!(List: "DepNode")),