File tree Expand file tree Collapse file tree 3 files changed +17
-6
lines changed
compiler/rustc_passes/src
tests/ui/consts/const-eval Expand file tree Collapse file tree 3 files changed +17
-6
lines changed Original file line number Diff line number Diff line change @@ -423,8 +423,11 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
423423
424424impl < ' tcx > Visitor < ' tcx > for MarkSymbolVisitor < ' tcx > {
425425 fn visit_nested_body ( & mut self , body : hir:: BodyId ) {
426- let old_maybe_typeck_results =
427- self . maybe_typeck_results . replace ( self . tcx . typeck_body ( body) ) ;
426+ let typeck_results = self . tcx . typeck_body ( body) ;
427+ if typeck_results. tainted_by_errors . is_some ( ) {
428+ return ;
429+ }
430+ let old_maybe_typeck_results = self . maybe_typeck_results . replace ( typeck_results) ;
428431 let body = self . tcx . hir ( ) . body ( body) ;
429432 self . visit_body ( body) ;
430433 self . maybe_typeck_results = old_maybe_typeck_results;
Original file line number Diff line number Diff line change 1+ //! This test tests two things at once:
2+ //! 1. we error if a const evaluation hits the deny-by-default lint limit
3+ //! 2. we do not ICE on invalid follow-up code
4+
5+ // compile-flags: -Z tiny-const-eval-limit
6+
17fn main ( ) {
28 // Tests the Collatz conjecture with an incorrect base case (0 instead of 1).
39 // The value of `n` will loop indefinitely (4 - 2 - 1 - 4).
4- let _ = [ ( ) ; {
10+ let s = [ ( ) ; {
511 let mut n = 113383 ; // #20 in https://oeis.org/A006884
612 while n != 0 {
713 //~^ ERROR is taking a long time
814 n = if n % 2 == 0 { n / 2 } else { 3 * n + 1 } ;
915 }
1016 n
1117 } ] ;
18+
19+ s. nonexistent_method ( ) ;
1220}
Original file line number Diff line number Diff line change 11error: constant evaluation is taking a long time
2- --> $DIR/infinite_loop.rs:6 :9
2+ --> $DIR/infinite_loop.rs:12 :9
33 |
44LL | / while n != 0 {
55LL | |
@@ -10,9 +10,9 @@ LL | | }
1010 = note: this lint makes sure the compiler doesn't get stuck due to infinite loops in const eval.
1111 If your compilation actually takes a long time, you can safely allow the lint.
1212help: the constant being evaluated
13- --> $DIR/infinite_loop.rs:4 :18
13+ --> $DIR/infinite_loop.rs:10 :18
1414 |
15- LL | let _ = [(); {
15+ LL | let s = [(); {
1616 | __________________^
1717LL | | let mut n = 113383; // #20 in https://oeis.org/A006884
1818LL | | while n != 0 {
You can’t perform that action at this time.
0 commit comments