Move a span_bug under a condition that cx is tainted

gurry · gurry · commit 9da3638c6a90 · 2024-07-07T15:44:55.000+05:30
Fixes an ICE caused when a with expression is not a struct
diff --git a/compiler/rustc_hir_typeck/src/expr_use_visitor.rs b/compiler/rustc_hir_typeck/src/expr_use_visitor.rs
@@ -734,7 +734,9 @@ impl<'tcx, Cx: TypeInformationCtxt<'tcx>, D: Delegate<'tcx>> ExprUseVisitor<'tcx
                 // struct; however, when EUV is run during typeck, it
                 // may not. This will generate an error earlier in typeck,
                 // so we can just ignore it.
-                span_bug!(with_expr.span, "with expression doesn't evaluate to a struct");
+                if self.cx.tainted_by_errors().is_ok() {
+                    span_bug!(with_expr.span, "with expression doesn't evaluate to a struct");
+                }
             }
         }
 
diff --git a/tests/crashes/127332.rs b/tests/crashes/127332.rs
diff --git a/tests/ui/typeck/ice-with-expr-not-struct-127332.rs b/tests/ui/typeck/ice-with-expr-not-struct-127332.rs
@@ -0,0 +1,15 @@
+// Regression test for ICE #127332
+
+// Tests that we do not ICE when a with expr is
+// not a struct but something else like an enum
+
+fn main() {
+    let x = || {
+        enum Foo {
+            A { x: u32 },
+        }
+        let orig = Foo::A { x: 5 };
+        Foo::A { x: 6, ..orig };
+        //~^ ERROR functional record update syntax requires a struct
+    };
+}
diff --git a/tests/ui/typeck/ice-with-expr-not-struct-127332.stderr b/tests/ui/typeck/ice-with-expr-not-struct-127332.stderr
@@ -0,0 +1,9 @@
+error[E0436]: functional record update syntax requires a struct
+  --> $DIR/ice-with-expr-not-struct-127332.rs:12:26
+   |
+LL |         Foo::A { x: 6, ..orig };
+   |                          ^^^^
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0436`.

Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,9 @@ impl<'tcx, Cx: TypeInformationCtxt<'tcx>, D: Delegate<'tcx>> ExprUseVisitor<'tcx`
`734`	`734`	`// struct; however, when EUV is run during typeck, it`
`735`	`735`	`// may not. This will generate an error earlier in typeck,`
`736`	`736`	`// so we can just ignore it.`
`737`		`- span_bug!(with_expr.span, "with expression doesn't evaluate to a struct");`
	`737`	`+ if self.cx.tainted_by_errors().is_ok() {`
	`738`	`+ span_bug!(with_expr.span, "with expression doesn't evaluate to a struct");`
	`739`	`+ }`
`738`	`740`	`}`
`739`	`741`	`}`
`740`	`742`