Add 'ty_error_with_guaranteed' and 'const_error_with_guaranteed'

[chenyukang]

Part of #103874

[rustbot]

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

[chenyukang]

r? @lcnr

[rustbot]

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

[chenyukang]

emm,
need wait #103915, and rebase master.

[lcnr]

r=me after nit + green perf

[lcnr]

err.emit_unless can be used here 🤔

[chenyukang]

change to

 let reported = err.emit_unless(lhs_ty.references_error() || rhs_ty.references_error());
 return self.tcx.ty_error_with_guaranteed(reported);

[lcnr]

@bors try @rust-timer queue

[rust-timer]

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

[bors]

⌛ Trying commit 134dda69bdb238053a2f417ea3ae4eed15df41b9 with merge 622859bba9ca3cca1ca580f819ca26e4ac9253bb...

[lcnr]

@bors try @rust-timer queue

[bors]

⌛ Trying commit 91ac1c33cc6e381a82d75ca80418f80f58657ad4 with merge 1d4e4a572b5249bf76ab7beff62d639bade9b9eb...

[bors]

💔 Test failed - checks-actions

[chenyukang]

The job dist-x86_64-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   Compiling rustc_builtin_macros v0.0.0 (/checkout/compiler/rustc_builtin_macros)
error[E0061]: this function takes 2 arguments but 1 argument was supplied
    --> compiler/rustc_middle/src/ty/context.rs:1313:14
     |
1313 |         self.mk_const(ty::ConstS { kind: ty::ConstKind::Error(reported), ty })
     |                      ||
     |                      ||
     |                      |expected enum `kind::ConstKind`, found struct `ConstS`
     |
note: associated function defined here
    --> compiler/rustc_middle/src/ty/context.rs:2589:12
     |
     |
2589 |     pub fn mk_const(self, kind: ty::ConstKind<'tcx>, ty: Ty<'tcx>) -> Const<'tcx> {
help: provide the argument
     |
     |
1313 |         self.mk_const(/* kind::ConstKind<'_> */, /* ty::Ty<'_> */)

[RUSTC-TIMING] rustc_ast_passes test:false 4.110
For more information about this error, try `rustc --explain E0061`.
[RUSTC-TIMING] rustc_middle test:false 7.533

@lcnr why this error didn't happen in CI, I also can not reproduce it in local.

[lcnr]

probably you have to first pull the new changes on master to fix this:

git fetch origin
git rebase origin/master

(or however you're calling the rust-lang remote)

[chenyukang]

Got it, rebased master, mk_const is changed in upstream.

[lcnr]

@bors try @rust-timer queue

[bors]

⌛ Trying commit 3320879 with merge 00d4742f8a01030d6091b53dfab0763567e88eda...

[bors]

☀️ Try build successful - checks-actions
Build commit: 00d4742f8a01030d6091b53dfab0763567e88eda (00d4742f8a01030d6091b53dfab0763567e88eda)

[rust-timer]

Finished benchmarking commit (00d4742f8a01030d6091b53dfab0763567e88eda): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.7%	[3.7%, 3.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

[lcnr]

@bors r+ rollup

[bors]

📌 Commit 3320879 has been approved by lcnr

It is now in the queue for this repository.