Use the explicit error constant instead of fake dummies

oli-obk · oli-obk · commit d5eec653c0d0 · 2021-03-12T12:25:08.000Z
diff --git a/compiler/rustc_mir_build/src/thir/cx/mod.rs b/compiler/rustc_mir_build/src/thir/cx/mod.rs
@@ -68,11 +68,11 @@ impl<'thir, 'tcx> Cx<'thir, 'tcx> {
                 // FIXME(#31407) this is only necessary because float parsing is buggy
                 self.tcx.sess.span_err(sp, "could not evaluate float literal (see issue #31407)");
                 // create a dummy value and continue compiling
-                Const::from_bits(self.tcx, 0, self.param_env.and(ty))
+                self.tcx.const_error(ty)
             }
             Err(LitToConstError::Reported) => {
                 // create a dummy value and continue compiling
-                Const::from_bits(self.tcx, 0, self.param_env.and(ty))
+                self.tcx.const_error(ty)
             }
             Err(LitToConstError::TypeError) => bug!("const_eval_literal: had type error"),
         }

Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,11 @@ impl<'thir, 'tcx> Cx<'thir, 'tcx> {`
`68`	`68`	`// FIXME(#31407) this is only necessary because float parsing is buggy`
`69`	`69`	`self.tcx.sess.span_err(sp, "could not evaluate float literal (see issue #31407)");`
`70`	`70`	`// create a dummy value and continue compiling`
`71`		`- Const::from_bits(self.tcx, 0, self.param_env.and(ty))`
	`71`	`+ self.tcx.const_error(ty)`
`72`	`72`	`}`
`73`	`73`	`Err(LitToConstError::Reported) => {`
`74`	`74`	`// create a dummy value and continue compiling`
`75`		`- Const::from_bits(self.tcx, 0, self.param_env.and(ty))`
	`75`	`+ self.tcx.const_error(ty)`
`76`	`76`	`}`
`77`	`77`	`Err(LitToConstError::TypeError) => bug!("const_eval_literal: had type error"),`
`78`	`78`	`}`