Fix: early return if typeck_results is tainted by errors

Author: Shunpoco

compiler/rustc_lint/src/builtin.rs

@@ -153,7 +153,10 @@ declare_lint_pass!(NonShorthandFieldPatterns => [NON_SHORTHAND_FIELD_PATTERNS]);
 
 impl<'tcx> LateLintPass<'tcx> for NonShorthandFieldPatterns {
     fn check_pat(&mut self, cx: &LateContext<'_>, pat: &hir::Pat<'_>) {
-        if let PatKind::Struct(ref qpath, field_pats, _) = pat.kind {
+        // The result shouldn't be tainted, otherwise it will cause ICE.
+        if let PatKind::Struct(ref qpath, field_pats, _) = pat.kind
+            && cx.typeck_results().tainted_by_errors.is_none()
+        {
             let variant = cx
                 .typeck_results()
                 .pat_ty(pat)

compiler/rustc_passes/src/dead.rs

@@ -521,8 +521,14 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
 
 impl<'tcx> Visitor<'tcx> for MarkSymbolVisitor<'tcx> {
     fn visit_nested_body(&mut self, body: hir::BodyId) {
-        let old_maybe_typeck_results =
-            self.maybe_typeck_results.replace(self.tcx.typeck_body(body));
+        let typeck_results = self.tcx.typeck_body(body);
+
+        // The result shouldn't be tainted, otherwise it will cause ICE.
+        if typeck_results.tainted_by_errors.is_some() {
+            return;
+        }
+
+        let old_maybe_typeck_results = self.maybe_typeck_results.replace(typeck_results);
         let body = self.tcx.hir_body(body);
         self.visit_body(body);
         self.maybe_typeck_results = old_maybe_typeck_results;

tests/ui/consts/do-not-ice-long-constant-evaluation-in-for-loop.rs

@@ -1,6 +1,6 @@
 // Issue-125323
 fn main() {
-    for _ in 0..0 { //~ ERROR type annotations needed [E0282]
+    for _ in 0..0 {
         [(); loop {}]; //~ ERROR constant evaluation is taking a long time
     }
 }

tests/ui/consts/do-not-ice-long-constant-evaluation-in-for-loop.stderr

@@ -13,12 +13,5 @@ LL |         [(); loop {}];
    |              ^^^^^^^
    = note: `#[deny(long_running_const_eval)]` on by default
 
-error[E0282]: type annotations needed
-  --> $DIR/do-not-ice-long-constant-evaluation-in-for-loop.rs:3:14
-   |
-LL |     for _ in 0..0 {
-   |              ^^^^ cannot infer type for struct `std::ops::Range<{integer}>`
-
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0282`.