Sync from rust 7450913

bjorn3 · bjorn3 · commit 88c48cd30888 · 2025-04-30T13:12:22.000Z
diff --git a/src/abi/mod.rs b/src/abi/mod.rs
@@ -443,7 +443,9 @@ pub(crate) fn codegen_terminator_call<'tcx>(
                     Err(instance) => Some(instance),
                 }
             }
-            InstanceKind::DropGlue(_, None) | ty::InstanceKind::AsyncDropGlueCtorShim(_, None) => {
+            // We don't need AsyncDropGlueCtorShim here because it is not `noop func`,
+            // it is `func returning noop future`
+            InstanceKind::DropGlue(_, None) => {
                 // empty drop glue - a nop.
                 let dest = target.expect("Non terminating drop_in_place_real???");
                 let ret_block = fx.get_block(dest);
@@ -713,9 +715,8 @@ pub(crate) fn codegen_drop<'tcx>(
     let drop_instance = Instance::resolve_drop_in_place(fx.tcx, ty);
     let ret_block = fx.get_block(target);
 
-    if let ty::InstanceKind::DropGlue(_, None) | ty::InstanceKind::AsyncDropGlueCtorShim(_, None) =
-        drop_instance.def
-    {
+    // AsyncDropGlueCtorShim can't be here
+    if let ty::InstanceKind::DropGlue(_, None) = drop_instance.def {
         // we don't actually need to drop anything
         fx.bcx.ins().jump(ret_block, &[]);
     } else {
diff --git a/src/base.rs b/src/base.rs
@@ -582,7 +582,11 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
             | TerminatorKind::CoroutineDrop => {
                 bug!("shouldn't exist at codegen {:?}", bb_data.terminator());
             }
-            TerminatorKind::Drop { place, target, unwind, replace: _ } => {
+            TerminatorKind::Drop { place, target, unwind, replace: _, drop, async_fut } => {
+                assert!(
+                    async_fut.is_none() && drop.is_none(),
+                    "Async Drop must be expanded or reset to sync before codegen"
+                );
                 let drop_place = codegen_place(fx, *place);
                 crate::abi::codegen_drop(fx, source_info, drop_place, *target, *unwind);
             }
diff --git a/src/lib.rs b/src/lib.rs
@@ -41,8 +41,8 @@ use std::sync::Arc;
 
 use cranelift_codegen::isa::TargetIsa;
 use cranelift_codegen::settings::{self, Configurable};
-use rustc_codegen_ssa::CodegenResults;
 use rustc_codegen_ssa::traits::CodegenBackend;
+use rustc_codegen_ssa::{CodegenResults, TargetConfig};
 use rustc_metadata::EncodedMetadata;
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
 use rustc_session::Session;
@@ -177,7 +177,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
         }
     }
 
-    fn target_features_cfg(&self, sess: &Session) -> (Vec<Symbol>, Vec<Symbol>) {
+    fn target_config(&self, sess: &Session) -> TargetConfig {
         // FIXME return the actually used target features. this is necessary for #[cfg(target_feature)]
         let target_features = if sess.target.arch == "x86_64" && sess.target.os != "none" {
             // x86_64 mandates SSE2 support and rustc requires the x87 feature to be enabled
@@ -196,7 +196,16 @@ impl CodegenBackend for CraneliftCodegenBackend {
         };
         // FIXME do `unstable_target_features` properly
         let unstable_target_features = target_features.clone();
-        (target_features, unstable_target_features)
+
+        TargetConfig {
+            target_features,
+            unstable_target_features,
+            // Cranelift does not yet support f16 or f128
+            has_reliable_f16: false,
+            has_reliable_f16_math: false,
+            has_reliable_f128: false,
+            has_reliable_f128_math: false,
+        }
     }
 
     fn print_version(&self) {

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,11 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {`
`582`	`582`	`\| TerminatorKind::CoroutineDrop => {`
`583`	`583`	`bug!("shouldn't exist at codegen {:?}", bb_data.terminator());`
`584`	`584`	`}`
`585`		`- TerminatorKind::Drop { place, target, unwind, replace: _ } => {`
	`585`	`+ TerminatorKind::Drop { place, target, unwind, replace: _, drop, async_fut } => {`
	`586`	`+ assert!(`
	`587`	`+ async_fut.is_none() && drop.is_none(),`
	`588`	`+ "Async Drop must be expanded or reset to sync before codegen"`
	`589`	`+ );`
`586`	`590`	`let drop_place = codegen_place(fx, *place);`
`587`	`591`	`crate::abi::codegen_drop(fx, source_info, drop_place, target, unwind);`
`588`	`592`	`}`