diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs
index d9bcd5e3481f3..6167b0d63a9ab 100644
--- a/compiler/rustc_lint/src/builtin.rs
+++ b/compiler/rustc_lint/src/builtin.rs
@@ -152,10 +152,7 @@ declare_lint_pass!(NonShorthandFieldPatterns => [NON_SHORTHAND_FIELD_PATTERNS]);
 
 impl<'tcx> LateLintPass<'tcx> for NonShorthandFieldPatterns {
     fn check_pat(&mut self, cx: &LateContext<'_>, pat: &hir::Pat<'_>) {
-        // 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()
-        {
+        if let PatKind::Struct(ref qpath, field_pats, _) = pat.kind {
             let variant = cx
                 .typeck_results()
                 .pat_ty(pat)
diff --git a/compiler/rustc_lint/src/late.rs b/compiler/rustc_lint/src/late.rs
index ccfba715a1be3..cb0f5f533d01d 100644
--- a/compiler/rustc_lint/src/late.rs
+++ b/compiler/rustc_lint/src/late.rs
@@ -89,6 +89,14 @@ impl<'tcx, T: LateLintPass<'tcx>> hir_visit::Visitor<'tcx> for LateContextAndPas
     }
 
     fn visit_nested_body(&mut self, body_id: hir::BodyId) {
+        // The typeck_result shouldn't be tainted, otherwise it will cause ICE.
+        // If rustdoc is the caller of this function, we shouldn't run typeck_body here.
+        if !self.context.tcx.sess.opts.actually_rustdoc
+            && self.context.tcx.typeck_body(body_id).tainted_by_errors.is_some()
+        {
+            return;
+        }
+
         let old_enclosing_body = self.context.enclosing_body.replace(body_id);
         let old_cached_typeck_results = self.context.cached_typeck_results.get();
 
diff --git a/tests/crashes/138361.rs b/tests/crashes/138361.rs
deleted file mode 100644
index 8661ed374744a..0000000000000
--- a/tests/crashes/138361.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//@ known-bug: #138361
-
-fn main() {
-  [0; loop{}];
-  std::mem::transmute(4)
-}
diff --git a/tests/ui/consts/do-not-ice-long-constant-evaluation-in-for-loop.rs b/tests/ui/consts/long-constant-evaluation-cause-dead-code.rs
similarity index 100%
rename from tests/ui/consts/do-not-ice-long-constant-evaluation-in-for-loop.rs
rename to tests/ui/consts/long-constant-evaluation-cause-dead-code.rs
diff --git a/tests/ui/consts/do-not-ice-long-constant-evaluation-in-for-loop.stderr b/tests/ui/consts/long-constant-evaluation-cause-dead-code.stderr
similarity index 78%
rename from tests/ui/consts/do-not-ice-long-constant-evaluation-in-for-loop.stderr
rename to tests/ui/consts/long-constant-evaluation-cause-dead-code.stderr
index 32a18469ab9e5..42181d2a22d56 100644
--- a/tests/ui/consts/do-not-ice-long-constant-evaluation-in-for-loop.stderr
+++ b/tests/ui/consts/long-constant-evaluation-cause-dead-code.stderr
@@ -1,5 +1,5 @@
 error: constant evaluation is taking a long time
-  --> $DIR/do-not-ice-long-constant-evaluation-in-for-loop.rs:10:14
+  --> $DIR/long-constant-evaluation-cause-dead-code.rs:10:14
    |
 LL |         [(); loop {}];
    |              ^^^^^^^
@@ -7,7 +7,7 @@ LL |         [(); loop {}];
    = note: this lint makes sure the compiler doesn't get stuck due to infinite loops in const eval.
            If your compilation actually takes a long time, you can safely allow the lint.
 help: the constant being evaluated
-  --> $DIR/do-not-ice-long-constant-evaluation-in-for-loop.rs:10:14
+  --> $DIR/long-constant-evaluation-cause-dead-code.rs:10:14
    |
 LL |         [(); loop {}];
    |              ^^^^^^^
diff --git a/tests/ui/consts/long-constant-evaluation-cause-ice-in-sty.rs b/tests/ui/consts/long-constant-evaluation-cause-ice-in-sty.rs
new file mode 100644
index 0000000000000..04d0f7ee2de84
--- /dev/null
+++ b/tests/ui/consts/long-constant-evaluation-cause-ice-in-sty.rs
@@ -0,0 +1,5 @@
+// The test confirms ICE-138361 is fixed.
+fn main() {
+  [0; loop{}]; //~ ERROR constant evaluation is taking a long time
+  std::mem::transmute(4)
+}
diff --git a/tests/ui/consts/long-constant-evaluation-cause-ice-in-sty.stderr b/tests/ui/consts/long-constant-evaluation-cause-ice-in-sty.stderr
new file mode 100644
index 0000000000000..5f4a96a984769
--- /dev/null
+++ b/tests/ui/consts/long-constant-evaluation-cause-ice-in-sty.stderr
@@ -0,0 +1,17 @@
+error: constant evaluation is taking a long time
+  --> $DIR/long-constant-evaluation-cause-ice-in-sty.rs:3:7
+   |
+LL |   [0; loop{}];
+   |       ^^^^^^
+   |
+   = note: this lint makes sure the compiler doesn't get stuck due to infinite loops in const eval.
+           If your compilation actually takes a long time, you can safely allow the lint.
+help: the constant being evaluated
+  --> $DIR/long-constant-evaluation-cause-ice-in-sty.rs:3:7
+   |
+LL |   [0; loop{}];
+   |       ^^^^^^
+   = note: `#[deny(long_running_const_eval)]` on by default
+
+error: aborting due to 1 previous error
+