Skip to content

Commit e3c98a8

Browse files
Rollup merge of rust-lang#104147 - WaffleLapkin:don't-compare-ptr-addresses-in-parser-, r=compiler-errors
Remove an address comparison from the parser Originally this check was added in rust-lang#68985, as suggested by rust-lang@940f657#r376850175. I don't think that this address check is a robust way of making parser more robust. This code is also extensively tested by [`ui/parser/issues/issue-35813-postfix-after-cast.rs`](https://github.com/rust-lang/rust/blob/57d3c58ed6e0faf89a62411f96c000ffc9fd3937/src/test/ui/parser/issues/issue-35813-postfix-after-cast.rs). _Replaces #103700_ r? `@compiler-errors`
2 parents ed38562 + 268ea35 commit e3c98a8

File tree

1 file changed

+2
-7
lines changed
  • compiler/rustc_parse/src/parser

1 file changed

+2
-7
lines changed

compiler/rustc_parse/src/parser/expr.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -833,16 +833,11 @@ impl<'a> Parser<'a> {
833833
("cast", None)
834834
};
835835

836-
// Save the memory location of expr before parsing any following postfix operators.
837-
// This will be compared with the memory location of the output expression.
838-
// If they different we can assume we parsed another expression because the existing expression is not reallocated.
839-
let addr_before = &*cast_expr as *const _ as usize;
840836
let with_postfix = self.parse_dot_or_call_expr_with_(cast_expr, span)?;
841-
let changed = addr_before != &*with_postfix as *const _ as usize;
842837

843838
// Check if an illegal postfix operator has been added after the cast.
844-
// If the resulting expression is not a cast, or has a different memory location, it is an illegal postfix operator.
845-
if !matches!(with_postfix.kind, ExprKind::Cast(_, _) | ExprKind::Type(_, _)) || changed {
839+
// If the resulting expression is not a cast, it is an illegal postfix operator.
840+
if !matches!(with_postfix.kind, ExprKind::Cast(_, _) | ExprKind::Type(_, _)) {
846841
let msg = format!(
847842
"{cast_kind} cannot be followed by {}",
848843
match with_postfix.kind {

0 commit comments

Comments
 (0)