about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSantiago Pastorino <spastorino@gmail.com>2020-04-22 09:23:06 -0300
committerSantiago Pastorino <spastorino@gmail.com>2020-04-23 18:07:36 -0300
commitda9aa2dd55b69a4c902af9b953904911e9cffb77 (patch)
treef4426d82131335cfdeba5ac599c75cff5c4dd805
parent39be0b5b6caa0090eaf91c797e2895a007e76354 (diff)
downloadrust-da9aa2dd55b69a4c902af9b953904911e9cffb77.tar.gz
rust-da9aa2dd55b69a4c902af9b953904911e9cffb77.zip
Adjust name of never typed const test
-rw-r--r--src/test/mir-opt/remove-never-const.rs (renamed from src/test/mir-opt/retain-never-const.rs)5
-rw-r--r--src/test/mir-opt/remove-never-const/rustc.no_codegen.PreCodegen.after.mir (renamed from src/test/mir-opt/retain-never-const/rustc.no_codegen.PreCodegen.after.mir)4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/test/mir-opt/retain-never-const.rs b/src/test/mir-opt/remove-never-const.rs
index af1077e6334..b2d4f14aa4c 100644
--- a/src/test/mir-opt/retain-never-const.rs
+++ b/src/test/mir-opt/remove-never-const.rs
@@ -1,5 +1,6 @@
-// Regression test for #66975 - ensure that we don't keep unevaluated
-// `!`-typed constants until codegen.
+// This was originally a regression test for #66975 - ensure that we do not generate never typed
+// consts in codegen. We also have tests for this that catches the error, see
+// src/test/ui/consts/const-eval/index-out-of-bounds-never-type.rs.
 
 // Force generation of optimized mir for functions that do not reach codegen.
 // compile-flags: --emit mir,link
diff --git a/src/test/mir-opt/retain-never-const/rustc.no_codegen.PreCodegen.after.mir b/src/test/mir-opt/remove-never-const/rustc.no_codegen.PreCodegen.after.mir
index 07d28efb9c3..1cc2138f19e 100644
--- a/src/test/mir-opt/retain-never-const/rustc.no_codegen.PreCodegen.after.mir
+++ b/src/test/mir-opt/remove-never-const/rustc.no_codegen.PreCodegen.after.mir
@@ -1,11 +1,11 @@
 // MIR for `no_codegen` after PreCodegen
 
 fn no_codegen() -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/retain-never-const.rs:18:20: 18:20
+    let mut _0: ();                      // return place in scope 0 at $DIR/remove-never-const.rs:19:20: 19:20
     scope 1 {
     }
 
     bb0: {
-        unreachable;                     // bb0[0]: scope 0 at $DIR/retain-never-const.rs:19:13: 19:33
+        unreachable;                     // bb0[0]: scope 0 at $DIR/remove-never-const.rs:20:13: 20:33
     }
 }