some bugfixes

Author: ZuseZ4

compiler/rustc_builtin_macros/src/autodiff.rs

@@ -88,6 +88,8 @@ pub fn expand(
     //check_builtin_macro_attribute(ecx, meta_item, sym::alloc_error_handler);
 
     // first get the annotable item:
+
+    use ast::visit::AssocCtxt;
     let (sig, is_impl): (FnSig, bool) = match &item {
         Annotatable::Item(ref iitem) => {
             let sig = match &iitem.kind {
@@ -99,7 +101,7 @@ pub fn expand(
             };
             (sig.clone(), false)
         },
-        Annotatable::ImplItem(ref assoc_item) => {
+        Annotatable::AssocItem(ref assoc_item, AssocCtxt::Impl) => {
             let sig = match &assoc_item.kind {
                 ast::AssocItemKind::Fn(box ast::Fn { sig, .. }) => sig,
                 _ => {
@@ -130,7 +132,7 @@ pub fn expand(
         Annotatable::Item(ref iitem) => {
             (iitem.vis.clone(), iitem.ident.clone())
         },
-        Annotatable::ImplItem(ref assoc_item) => {
+        Annotatable::AssocItem(ref assoc_item, AssocCtxt::Impl) => {
             (assoc_item.vis.clone(), assoc_item.ident.clone())
         },
         _ => {
@@ -240,14 +242,14 @@ pub fn expand(
             }
             Annotatable::Item(iitem.clone())
         },
-        Annotatable::ImplItem(ref mut assoc_item) => {
+        Annotatable::AssocItem(ref mut assoc_item, i @ AssocCtxt::Impl) => {
             if !assoc_item.attrs.iter().any(|a| a.id == attr.id) {
                 assoc_item.attrs.push(attr.clone());
             }
             if !assoc_item.attrs.iter().any(|a| a.id == inline_never.id) {
                 assoc_item.attrs.push(inline_never.clone());
             }
-            Annotatable::ImplItem(assoc_item.clone())
+            Annotatable::AssocItem(assoc_item.clone(), i)
         },
         _ => {
             panic!("not supported");
@@ -273,7 +275,7 @@ pub fn expand(
             kind: assoc_item,
             tokens: None,
         });
-        Annotatable::ImplItem(d_fn)
+        Annotatable::AssocItem(d_fn, AssocCtxt::Impl)
     } else {
         let mut d_fn = ecx.item(span, d_ident, thin_vec![attr.clone(), inline_never], ItemKind::Fn(asdf));
         d_fn.vis = vis;

compiler/rustc_builtin_macros/src/errors.rs

@@ -191,6 +191,7 @@ pub(crate) struct AutoDiffInvalidApplication {
     pub(crate) span: Span,
 }
 
+#[cfg(not(llvm_enzyme))]
 #[derive(Diagnostic)]
 #[diag(builtin_macros_autodiff_not_build)]
 pub(crate) struct AutoDiffSupportNotBuild {

compiler/rustc_middle/src/ty/mod.rs

@@ -109,7 +109,7 @@ pub use self::visit::{TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeV
 pub use self::AssocItemContainer::*;
 pub use self::BorrowKind::*;
 pub use self::IntVarValue::*;
-use crate::error::{OpaqueHiddenTypeMismatch, TypeMismatchReason, UnsupportedUnion, AutodiffUnsafeInnerConstRef};
+use crate::error::{OpaqueHiddenTypeMismatch, TypeMismatchReason};
 use crate::metadata::ModChild;
 use crate::middle::privacy::EffectiveVisibilities;
 use crate::mir::{Body, CoroutineLayout};
@@ -119,7 +119,6 @@ use crate::ty;
 pub use crate::ty::diagnostics::*;
 use crate::ty::fast_reject::SimplifiedType;
 use crate::ty::util::Discr;
-use crate::query::Key;
 
 pub mod abstract_const;
 pub mod adjustment;

compiler/rustc_middle/src/ty/typetree.rs

@@ -1,12 +1,10 @@
-use crate::ty::{self, Ty, FieldsShape, TypeAndMut};
+use crate::ty::{self, Ty, FieldsShape};
 use rustc_ast::expand::typetree::{Type, TypeTree, FncTree, Kind};
 //, Type, Kind, TypeTree, FncTree, FieldsShape};
 use super::context::TyCtxt;
 use rustc_span::Span;
 use super::{ParamEnv, ParamEnvAnd};
 use crate::error::AutodiffUnsafeInnerConstRef;
-use super::adt::*;
-use rustc_hir as hir;
 use rustc_type_ir::Adt;
 use tracing::trace;
 
@@ -67,7 +65,7 @@ pub fn fnc_typetrees<'tcx>(tcx: TyCtxt<'tcx>, fn_ty: Ty<'tcx>, da: &mut Vec<Diff
             if ty.is_fn_ptr() {
                 unimplemented!("what to do whith fn ptr?");
             }
-            let inner_ty = ty.builtin_deref(true).unwrap().ty;
+            let inner_ty = ty.builtin_deref(true).unwrap();
             if inner_ty.is_slice() {
                 // We know that the lenght will be passed as extra arg.
                 let child = typetree_from_ty(inner_ty, tcx, 1, safety, &mut visited, span);