Unrolled build for rust-lang#130667

rust-timer · web-flow · commit b60c7719caa4 · 2024-09-21T20:30:15.000-04:00
Rollup merge of rust-lang#130667 - workingjubilee:she-is-c-c-c-cold, r=compiler-errors compiler: Accept "improper" ctypes in extern "rust-cold" fn
diff --git a/compiler/rustc_lint/src/types.rs b/compiler/rustc_lint/src/types.rs
@@ -1320,7 +1320,10 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
     }
 
     fn is_internal_abi(&self, abi: SpecAbi) -> bool {
-        matches!(abi, SpecAbi::Rust | SpecAbi::RustCall | SpecAbi::RustIntrinsic)
+        matches!(
+            abi,
+            SpecAbi::Rust | SpecAbi::RustCall | SpecAbi::RustCold | SpecAbi::RustIntrinsic
+        )
     }
 
     /// Find any fn-ptr types with external ABIs in `ty`.
diff --git a/tests/ui/lint/rust-cold-fn-accept-improper-ctypes.rs b/tests/ui/lint/rust-cold-fn-accept-improper-ctypes.rs
@@ -0,0 +1,14 @@
+//@ check-pass
+#![feature(rust_cold_cc)]
+
+// extern "rust-cold" is a "Rust" ABI so we accept `repr(Rust)` types as arg/ret without warnings.
+
+pub extern "rust-cold" fn f(_: ()) -> Result<(), ()> {
+    Ok(())
+}
+
+extern "rust-cold" {
+    pub fn g(_: ()) -> Result<(), ()>;
+}
+
+fn main() {}

Original file line number	Diff line number	Diff line change
`@@ -1320,7 +1320,10 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {`
`1320`	`1320`	`}`
`1321`	`1321`
`1322`	`1322`	`fn is_internal_abi(&self, abi: SpecAbi) -> bool {`
`1323`		`- matches!(abi, SpecAbi::Rust \| SpecAbi::RustCall \| SpecAbi::RustIntrinsic)`
	`1323`	`+ matches!(`
	`1324`	`+ abi,`
	`1325`	`+ SpecAbi::Rust \| SpecAbi::RustCall \| SpecAbi::RustCold \| SpecAbi::RustIntrinsic`
	`1326`	`+ )`
`1324`	`1327`	`}`
`1325`	`1328`
`1326`	`1329`	/// Find any fn-ptr types with external ABIs in `ty`.