Fix ICE when suggesting dereferencing binop operands #119361

sjwang05 · 2023-12-27T20:50:37Z

Fixes #119352

rustbot · 2023-12-27T20:50:45Z

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

compiler-errors

This code continues to fail because it's trying to construct a trait predicate for the Sized trait with 2 generic arguments. We should not be trying to perform this code on traits that are not operators.

sjwang05 · 2023-12-28T00:04:33Z

That makes sense, thanks for the help. I've added a check for that.

@rustbot review

WaffleLapkin · 2023-12-28T07:57:38Z

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+            && hir::lang_items::OPERATORS.iter().any(|&op| {
+                // Ensure we only run this code on operators
+                self.tcx.require_lang_item(op, None) == trait_pred.skip_binder().trait_ref.def_id
+            })


Diagnostic code should not require language items. Please use a fallible API.

Suggested change

&& hir::lang_items::OPERATORS.iter().any(|&op| {

// Ensure we only run this code on operators

self.tcx.require_lang_item(op, None) == trait_pred.skip_binder().trait_ref.def_id

})

// Ensure we only run this code on operators

&& hir::lang_items::OPERATORS.iter().filter_map(|&op| self.tcx.lang_items().get(op)).any(|op| {

op == trait_pred.skip_binder().trait_ref.def_id

})

@rustbot author

This needs to check that it's a binary operator as well. This still would ICE if I had a nested unary operator as a predicate.

Diagnostic code should not require language items. Please use a fallible API.

Fixed, thanks for pointing this out.

This still would ICE if I had a nested unary operator as a predicate.

I don't think this is necessarily the case--we already check that the rhs is Some, which would fail if it were a unary op: https://github.com/sjwang05/rust/blob/issue-119352/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs#L856

@rustbot review

I don't think this is necessarily the case--we already check that the rhs is Some

No, you can have a binary operator predicate with a unary operator predicate as a where clause bound.

Ahh, I see. I fixed the check to filter out unary ops.

@rustbot review

compiler-errors · 2024-01-03T19:35:40Z

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

-                                    self.tcx.mk_args(
-                                        &[&[l_ty.into(), r_ty.into()], &inner.trait_ref.args[2..]]
-                                            .concat(),
+                                    self.tcx.mk_args_trait(


Why did you use mk_args_trait here? It's harder to read, imo. You should just use mk_args like before. The indexing that was previous here should be correct if we're always using binop traits here.

Mainly due to the indexing problem--I reverted it to mk_args.

WaffleLapkin

Just a small nitpick and I think we can merge this :)

WaffleLapkin · 2024-01-12T12:20:11Z

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+                .filter_map(|&op|
+                    (!matches!(op, LangItem::Neg | LangItem::Not))
+                        .then_some(self.tcx.lang_items().get(op))
+                        .flatten()
+                )


sjwang05 · 2024-01-13T00:58:01Z

Fixed, thanks.

@rustbot review

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

WaffleLapkin

Thanks!

WaffleLapkin · 2024-01-14T03:37:35Z

@bors r+ rollup

bors · 2024-01-14T03:37:37Z

📌 Commit c36b5d5 has been approved by WaffleLapkin

It is now in the queue for this repository.

bors · 2024-01-14T09:39:06Z

⌛ Testing commit c36b5d5 with merge 8847bda...

bors · 2024-01-14T11:37:02Z

☀️ Test successful - checks-actions
Approved by: WaffleLapkin
Pushing 8847bda to master...

rust-timer · 2024-01-14T12:50:13Z

Finished benchmarking commit (8847bda): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.5%	[-1.5%, -1.5%]	1
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: 668.181s -> 668.597s (0.06%)
Artifact size: 308.18 MiB -> 308.21 MiB (0.01%)

rustbot assigned WaffleLapkin Dec 27, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 27, 2023

This comment has been minimized.

# to view

compiler-errors requested changes Dec 27, 2023

View reviewed changes

compiler-errors mentioned this pull request Dec 27, 2023

Emit better suggestions for &T == T and T == &T #118431

Merged

sjwang05 force-pushed the issue-119352 branch from 8a671d9 to 5b3ce22 Compare December 27, 2023 23:13

WaffleLapkin reviewed Dec 28, 2023

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 28, 2023

sjwang05 force-pushed the issue-119352 branch from 5b3ce22 to 296f597 Compare January 3, 2024 19:30

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 3, 2024

compiler-errors reviewed Jan 3, 2024

View reviewed changes

sjwang05 force-pushed the issue-119352 branch 3 times, most recently from c29b565 to 44e5631 Compare January 4, 2024 08:56

WaffleLapkin requested changes Jan 12, 2024

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 12, 2024

sjwang05 force-pushed the issue-119352 branch from 44e5631 to 824fd62 Compare January 12, 2024 23:02

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 13, 2024

compiler-errors reviewed Jan 13, 2024

View reviewed changes

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs Outdated Show resolved Hide resolved

Fix ICE when suggesting dereferencing binop operands

c36b5d5

sjwang05 force-pushed the issue-119352 branch from 824fd62 to c36b5d5 Compare January 13, 2024 01:51

WaffleLapkin approved these changes Jan 14, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 14, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 14, 2024

bors merged commit 8847bda into rust-lang:master Jan 14, 2024

rustbot added this to the 1.77.0 milestone Jan 14, 2024

sjwang05 deleted the issue-119352 branch January 16, 2024 03:17

Fix ICE when suggesting dereferencing binop operands #119361

Fix ICE when suggesting dereferencing binop operands #119361

Uh oh!

Conversation

sjwang05 commented Dec 27, 2023

Uh oh!

rustbot commented Dec 27, 2023

Uh oh!

This comment has been minimized.

compiler-errors left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sjwang05 commented Dec 28, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WaffleLapkin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sjwang05 commented Jan 13, 2024

Uh oh!

Uh oh!

WaffleLapkin left a comment

Choose a reason for hiding this comment

Uh oh!

WaffleLapkin commented Jan 14, 2024

Uh oh!

bors commented Jan 14, 2024

Uh oh!

bors commented Jan 14, 2024

Uh oh!

bors commented Jan 14, 2024

Uh oh!

rust-timer commented Jan 14, 2024

Overall result: ❌ regressions - no action needed

Uh oh!

Uh oh!

compiler-errors left a comment •

edited

Loading