Change derive macro for Eq to not impl Eq trait fn

compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs

@@ -1,13 +1,82 @@
+use rustc_ast::mut_visit::{self, MutVisitor};
 use rustc_ast::{self as ast, MetaItem, Safety};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_expand::base::{Annotatable, ExtCtxt};
-use rustc_span::{Span, sym};
+use rustc_span::{Ident, Span, kw, sym};
 use thin_vec::{ThinVec, thin_vec};
 
-use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+struct ReplaceSelfTyVisitor(Box<ast::Ty>);
+impl MutVisitor for ReplaceSelfTyVisitor {
+    fn visit_ty(&mut self, ty: &mut ast::Ty) {
+        if let ast::TyKind::Path(None, path) = &mut ty.kind
+            && let [segment] = &path.segments[..]
+            && *segment == kw::SelfUpper
+        {
+            *ty = *self.0.clone();
+        } else {
+            mut_visit::walk_ty(self, ty);
+        }
+    }
+}
+
+struct RespanGenericsVisitor(Span);
+impl MutVisitor for RespanGenericsVisitor {
+    fn visit_generics(&mut self, generics: &mut ast::Generics) {
+        generics.where_clause.span = self.0.with_ctxt(generics.where_clause.span.ctxt());
+        generics.span = self.0.with_ctxt(generics.span.ctxt());
+        mut_visit::walk_generics(self, generics);
+    }
+    fn visit_where_predicate(&mut self, predicate: &mut ast::WherePredicate) {
+        predicate.span = self.0.with_ctxt(predicate.span.ctxt());
+        mut_visit::walk_where_predicate(self, predicate);
+    }
+    fn visit_where_predicate_kind(&mut self, kind: &mut ast::WherePredicateKind) {
+        match kind {
+            ast::WherePredicateKind::BoundPredicate(bound_predicate) => {
+                bound_predicate.bounded_ty.span =
+                    self.0.with_ctxt(bound_predicate.bounded_ty.span.ctxt());
+            }
+            ast::WherePredicateKind::EqPredicate(eq_predicate) => {
+                eq_predicate.lhs_ty.span = self.0.with_ctxt(eq_predicate.lhs_ty.span.ctxt());
+                eq_predicate.rhs_ty.span = self.0.with_ctxt(eq_predicate.rhs_ty.span.ctxt());
+            }
+            ast::WherePredicateKind::RegionPredicate(_) => {}
+        }
+        mut_visit::walk_where_predicate_kind(self, kind);
+    }
+    fn visit_param_bound(
+        &mut self,
+        bound: &mut rustc_ast::GenericBound,
+        _ctxt: rustc_ast::visit::BoundKind,
+    ) {
+        match bound {
+            ast::GenericBound::Trait(poly_trait_ref) => {
+                poly_trait_ref.span = self.0.with_ctxt(poly_trait_ref.span.ctxt());
+            }
+            ast::GenericBound::Outlives(_) => {}
+            ast::GenericBound::Use(_, _) => {}
+        }
+        ast::mut_visit::walk_param_bound(self, bound);
+    }
+}
+
+struct StripConstTraitBoundsVisitor;
+impl MutVisitor for StripConstTraitBoundsVisitor {
+    fn visit_param_bound(
+        &mut self,
+        bound: &mut rustc_ast::GenericBound,
+        _ctxt: rustc_ast::visit::BoundKind,
+    ) {
+        if let ast::GenericBound::Trait(poly_trait_ref) = bound {
+            poly_trait_ref.modifiers.constness = ast::BoundConstness::Never;
+        }
+        mut_visit::walk_param_bound(self, bound);
+    }
+}
+
 pub(crate) fn expand_deriving_eq(
     cx: &ExtCtxt<'_>,
     span: Span,
@@ -18,45 +87,122 @@ pub(crate) fn expand_deriving_eq(
 ) {
     let span = cx.with_def_site_ctxt(span);
 
+    let mut fn_generics = ast::Generics { span, ..Default::default() };
+    let mut self_ty = None;
+
     let trait_def = TraitDef {
         span,
         path: path_std!(cmp::Eq),
         skip_path_as_bound: false,
         needs_copy_as_bound_if_packed: true,
         additional_bounds: Vec::new(),
         supports_unions: true,
-        methods: vec![MethodDef {
-            name: sym::assert_fields_are_eq,
-            generics: Bounds::empty(),
-            explicit_self: true,
-            nonself_args: vec![],
-            ret_ty: Unit,
-            attributes: thin_vec![
-                // This method will never be called, so doing codegen etc. for it is unnecessary.
-                // We prevent this by adding `#[inline]`, which improves compile-time.
-                cx.attr_word(sym::inline, span),
-                cx.attr_nested_word(sym::doc, sym::hidden, span),
-                cx.attr_nested_word(sym::coverage, sym::off, span),
-            ],
-            fieldless_variants_strategy: FieldlessVariantsStrategy::Unify,
-            combine_substructure: combine_substructure(Box::new(|a, b, c| {
-                cs_total_eq_assert(a, b, c)
-            })),
-        }],
+        methods: Vec::new(),
         associated_types: Vec::new(),
         is_const,
         is_staged_api_crate: cx.ecfg.features.staged_api(),
         safety: Safety::Default,
         document: true,
     };
-    trait_def.expand_ext(cx, mitem, item, push, true)
+    trait_def.expand_ext(
+        cx,
+        mitem,
+        item,
+        &mut |mut a| {
+            let Annotatable::Item(item) = &mut a else {
+                unreachable!("should have emitted an Item in trait_def.expand_ext");
+            };
+            let ast::ItemKind::Impl(imp) = &mut item.kind else {
+                unreachable!("should have emitted an Impl in trait_def.expand_ext");
+            };
+            use ast::mut_visit::MutVisitor;
+            RespanGenericsVisitor(span).visit_generics(&mut imp.generics);
+            fn_generics = imp.generics.clone();
+            self_ty = Some(imp.self_ty.clone());
+            push(a)
+        },
+        true,
+    );
+
+    let self_ty =
+        self_ty.unwrap_or_else(|| cx.dcx().span_bug(span, "missing self type in `derive(Eq)`"));
+    let assert_stmts = eq_assert_stmts_from_item(cx, span, item, ReplaceSelfTyVisitor(self_ty));
+
+    // Skip generating `assert_fields_are_eq` impl if there are no assertions to make
+    if assert_stmts.is_empty() {
+        return;
+    }
+
+    StripConstTraitBoundsVisitor.visit_generics(&mut fn_generics);
+    push(Annotatable::Item(expand_const_item_block(cx, span, fn_generics, assert_stmts)));
+}
+
+fn expand_const_item_block(
+    cx: &ExtCtxt<'_>,
+    span: Span,
+    fn_generics: ast::Generics,
+    assert_stmts: ThinVec<ast::Stmt>,
+) -> Box<ast::Item> {
+    cx.item(
+        span,
+        ast::AttrVec::new(),
+        ast::ItemKind::ConstBlock(ast::ConstBlockItem {
+            span,
+            id: ast::DUMMY_NODE_ID,
+            block: cx.block(
+                span,
+                thin_vec![ast::Stmt {
+                    span,
+                    id: ast::DUMMY_NODE_ID,
+                    kind: ast::StmtKind::Item(Box::new(ast::Item {
+                        span,
+                        id: ast::DUMMY_NODE_ID,
+                        attrs: thin_vec![
+                            cx.attr_nested_word(sym::doc, sym::hidden, span),
+                            cx.attr_nested_word(sym::coverage, sym::off, span),
+                            // This function will never be called, so doing codegen etc. for it is
+                            // unnecessary. We prevent this by adding `#[inline]`, which improves
+                            // compile-time.
+                            cx.attr_word(sym::inline, span),
+                        ],
+                        vis: ast::Visibility {
+                            kind: ast::VisibilityKind::Inherited,
+                            span,
+                            tokens: None,
+                        },
+                        tokens: None,
+                        kind: ast::ItemKind::Fn(Box::new(ast::Fn {
+                            defaultness: ast::Defaultness::Implicit,
+                            ident: Ident::new(sym::assert_fields_are_eq, span),
+                            generics: fn_generics,
+                            sig: ast::FnSig {
+                                header: ast::FnHeader {
+                                    constness: ast::Const::Yes(span),
+                                    coroutine_kind: None,
+                                    safety: ast::Safety::Default,
+                                    ext: ast::Extern::None,
+                                },
+                                decl: cx.fn_decl(ThinVec::new(), ast::FnRetTy::Default(span)),
+                                span,
+                            },
+                            contract: None,
+                            define_opaque: None,
+                            body: Some(cx.block(span, assert_stmts)),
+                            eii_impls: ThinVec::new(),
+                        }))
+                    }))
+                },],
+            ),
+        }),
+    )
 }
 
-fn cs_total_eq_assert(
+fn eq_assert_stmts_from_item(
     cx: &ExtCtxt<'_>,
-    trait_span: Span,
-    substr: &Substructure<'_>,
-) -> BlockOrExpr {
+    span: Span,
+    item: &Annotatable,
+    mut replace_self_ty: ReplaceSelfTyVisitor,
+) -> ThinVec<ast::Stmt> {
     let mut stmts = ThinVec::new();
     let mut seen_type_names = FxHashSet::default();
     let mut process_variant = |variant: &ast::VariantData| {
@@ -69,28 +215,36 @@ fn cs_total_eq_assert(
             {
                 // Already produced an assertion for this type.
             } else {
+                use ast::mut_visit::MutVisitor;
+                let mut field_ty = field.ty.clone();
+                replace_self_ty.visit_ty(&mut field_ty);
                 // let _: AssertParamIsEq<FieldTy>;
                 super::assert_ty_bounds(
                     cx,
                     &mut stmts,
-                    field.ty.clone(),
+                    field_ty,
                     field.span,
                     &[sym::cmp, sym::AssertParamIsEq],
                 );
             }
         }
     };
-
-    match *substr.fields {
-        StaticStruct(vdata, ..) => {
-            process_variant(vdata);
-        }
-        StaticEnum(enum_def, ..) => {
-            for variant in &enum_def.variants {
-                process_variant(&variant.data);
+    match item {
+        Annotatable::Item(item) => match &item.kind {
+            ast::ItemKind::Struct(_, _, vdata) => {
+                process_variant(vdata);
             }
-        }
-        _ => cx.dcx().span_bug(trait_span, "unexpected substructure in `derive(Eq)`"),
+            ast::ItemKind::Enum(_, _, enum_def) => {
+                for variant in &enum_def.variants {
+                    process_variant(&variant.data);
+                }
+            }
+            ast::ItemKind::Union(_, _, vdata) => {
+                process_variant(vdata);
+            }
+            _ => cx.dcx().span_bug(span, "unexpected item in `derive(Eq)`"),
+        },
+        _ => cx.dcx().span_bug(span, "unexpected item in `derive(Eq)`"),
     }
-    BlockOrExpr::new_stmts(stmts)
+    stmts
 }

compiler/rustc_builtin_macros/src/deriving/generic/mod.rs

@@ -362,10 +362,6 @@ struct TypeParameter {
 pub(crate) struct BlockOrExpr(ThinVec<ast::Stmt>, Option<Box<Expr>>);
 
 impl BlockOrExpr {
-    pub(crate) fn new_stmts(stmts: ThinVec<ast::Stmt>) -> BlockOrExpr {
-        BlockOrExpr(stmts, None)
-    }
-
     pub(crate) fn new_expr(expr: Box<Expr>) -> BlockOrExpr {
         BlockOrExpr(ThinVec::new(), Some(expr))
     }

tests/ui/deriving/deriving-all-codegen.rs

@@ -79,6 +79,10 @@ struct Reorder {
     b10: &'static *const bool,
 }
 
+// A struct with a recursive type.
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+struct Recursive(Option<Box<Self>>);
+
 // A struct that doesn't impl `Copy`, which means it gets the non-trivial
 // `clone` implemention that clones the fields individually.
 #[derive(Clone)]
@@ -119,6 +123,10 @@ struct Generic<T: Trait, U> {
     u: U,
 }
 
+// A generic struct involving a lifetime and an associated type.
+#[derive(Clone, Copy, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
+struct GenericLifetime<'a, T: Trait>(&'a T);
+
 // A packed, generic tuple struct involving an associated type. Because it is
 // packed, a `T: Copy` bound is added to all impls (and where clauses within
 // them) except for `Default`. This is because we must access fields using