Add support for emitting functions with coldcc in LLVM

The eventual goal is to try using this for things like the internal panicking stuff, to see whether it helps.
This commit is contained in:
Scott McMurray 2022-05-29 00:25:14 -07:00
parent 0acc4a3585
commit e90be842fb
12 changed files with 128 additions and 3 deletions

View File

@ -113,6 +113,14 @@ impl<'a> PostExpansionVisitor<'a> {
"rust-call ABI is subject to change"
);
}
"rust-cold" => {
gate_feature_post!(
&self,
rust_cold_cc,
span,
"rust-cold is experimental and subject to change"
);
}
"ptx-kernel" => {
gate_feature_post!(
&self,

View File

@ -22,7 +22,7 @@ fn clif_sig_from_fn_abi<'tcx>(
fn_abi: &FnAbi<'tcx, Ty<'tcx>>,
) -> Signature {
let call_conv = match fn_abi.conv {
Conv::Rust | Conv::C => default_call_conv,
Conv::Rust | Conv::C | Conv::RustCold => default_call_conv,
Conv::X86_64SysV => CallConv::SystemV,
Conv::X86_64Win64 => CallConv::WindowsFastcall,
Conv::ArmAapcs

View File

@ -393,6 +393,7 @@ impl<'ll, 'tcx> FnAbiLlvmExt<'ll, 'tcx> for FnAbi<'tcx, Ty<'tcx>> {
fn llvm_cconv(&self) -> llvm::CallConv {
match self.conv {
Conv::C | Conv::Rust | Conv::CCmseNonSecureCall => llvm::CCallConv,
Conv::RustCold => llvm::ColdCallConv,
Conv::AmdGpuKernel => llvm::AmdGpuKernel,
Conv::AvrInterrupt => llvm::AvrInterrupt,
Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt,

View File

@ -496,6 +496,8 @@ declare_features! (
(incomplete, repr128, "1.16.0", Some(56071), None),
/// Allows `repr(simd)` and importing the various simd intrinsics.
(active, repr_simd, "1.4.0", Some(27731), None),
/// Allows `extern "rust-cold"`.
(active, rust_cold_cc, "1.63.0", Some(97544), None),
/// Allows the use of SIMD types in functions declared in `extern` blocks.
(active, simd_ffi, "1.0.0", Some(27731), None),
/// Allows specialization of implementations (RFC 1210).

View File

@ -2971,7 +2971,7 @@ pub fn fn_can_unwind<'tcx>(tcx: TyCtxt<'tcx>, fn_def_id: Option<DefId>, abi: Spe
| RustIntrinsic
| PlatformIntrinsic
| Unadjusted => false,
Rust | RustCall => tcx.sess.panic_strategy() == PanicStrategy::Unwind,
Rust | RustCall | RustCold => tcx.sess.panic_strategy() == PanicStrategy::Unwind,
}
}
@ -2980,6 +2980,7 @@ pub fn conv_from_spec_abi(tcx: TyCtxt<'_>, abi: SpecAbi) -> Conv {
use rustc_target::spec::abi::Abi::*;
match tcx.sess.target.adjust_abi(abi) {
RustIntrinsic | PlatformIntrinsic | Rust | RustCall => Conv::Rust,
RustCold => Conv::RustCold,
// It's the ABI's job to select this, not ours.
System { .. } => bug!("system abi should be selected elsewhere"),

View File

@ -1160,6 +1160,7 @@ symbols! {
rust_2024,
rust_2024_preview,
rust_begin_unwind,
rust_cold_cc,
rust_eh_catch_typeinfo,
rust_eh_personality,
rust_eh_register_frames,

View File

@ -580,6 +580,11 @@ pub enum Conv {
C,
Rust,
/// For things unlikely to be called, where smaller caller codegen is
/// preferred over raw speed.
/// Stronger than just `#[cold]` because `fn` pointers might be incompatible.
RustCold,
// Target-specific calling conventions.
ArmAapcs,
CCmseNonSecureCall,

View File

@ -35,6 +35,7 @@ pub enum Abi {
RustCall,
PlatformIntrinsic,
Unadjusted,
RustCold,
}
#[derive(Copy, Clone)]
@ -81,6 +82,7 @@ const AbiDatas: &[AbiData] = &[
AbiData { abi: Abi::RustCall, name: "rust-call" },
AbiData { abi: Abi::PlatformIntrinsic, name: "platform-intrinsic" },
AbiData { abi: Abi::Unadjusted, name: "unadjusted" },
AbiData { abi: Abi::RustCold, name: "rust-cold" },
];
/// Returns the ABI with the given name (if any).
@ -139,6 +141,7 @@ impl Abi {
RustCall => 31,
PlatformIntrinsic => 32,
Unadjusted => 33,
RustCold => 34,
};
debug_assert!(
AbiDatas

View File

@ -1618,7 +1618,8 @@ impl Target {
| PlatformIntrinsic
| Unadjusted
| Cdecl { .. }
| EfiApi => true,
| EfiApi
| RustCold => true,
X86Interrupt => ["x86", "x86_64"].contains(&&self.arch[..]),
Aapcs { .. } => "arm" == self.arch,
CCmseNonSecureCall => ["arm", "aarch64"].contains(&&self.arch[..]),

View File

@ -0,0 +1,16 @@
// compile-flags: -C no-prepopulate-passes
#![crate_type = "lib"]
#![feature(rust_cold_cc)]
// CHECK: define coldcc void @this_should_never_happen(i16
// CHECK: call coldcc void @this_should_never_happen(i16
#[no_mangle]
pub extern "rust-cold" fn this_should_never_happen(x: u16) {}
pub fn do_things(x: u16) {
if x == 12345 {
this_should_never_happen(54321);
}
}

View File

@ -0,0 +1,21 @@
#![crate_type = "lib"]
extern "rust-cold" fn fu() {} //~ ERROR rust-cold is experimental
trait T {
extern "rust-cold" fn mu(); //~ ERROR rust-cold is experimental
extern "rust-cold" fn dmu() {} //~ ERROR rust-cold is experimental
}
struct S;
impl T for S {
extern "rust-cold" fn mu() {} //~ ERROR rust-cold is experimental
}
impl S {
extern "rust-cold" fn imu() {} //~ ERROR rust-cold is experimental
}
type TAU = extern "rust-cold" fn(); //~ ERROR rust-cold is experimental
extern "rust-cold" {} //~ ERROR rust-cold is experimental

View File

@ -0,0 +1,66 @@
error[E0658]: rust-cold is experimental and subject to change
--> $DIR/feature-gate-rust_cold_cc.rs:3:8
|
LL | extern "rust-cold" fn fu() {}
| ^^^^^^^^^^^
|
= note: see issue #97544 <https://github.com/rust-lang/rust/issues/97544> for more information
= help: add `#![feature(rust_cold_cc)]` to the crate attributes to enable
error[E0658]: rust-cold is experimental and subject to change
--> $DIR/feature-gate-rust_cold_cc.rs:6:12
|
LL | extern "rust-cold" fn mu();
| ^^^^^^^^^^^
|
= note: see issue #97544 <https://github.com/rust-lang/rust/issues/97544> for more information
= help: add `#![feature(rust_cold_cc)]` to the crate attributes to enable
error[E0658]: rust-cold is experimental and subject to change
--> $DIR/feature-gate-rust_cold_cc.rs:7:12
|
LL | extern "rust-cold" fn dmu() {}
| ^^^^^^^^^^^
|
= note: see issue #97544 <https://github.com/rust-lang/rust/issues/97544> for more information
= help: add `#![feature(rust_cold_cc)]` to the crate attributes to enable
error[E0658]: rust-cold is experimental and subject to change
--> $DIR/feature-gate-rust_cold_cc.rs:12:12
|
LL | extern "rust-cold" fn mu() {}
| ^^^^^^^^^^^
|
= note: see issue #97544 <https://github.com/rust-lang/rust/issues/97544> for more information
= help: add `#![feature(rust_cold_cc)]` to the crate attributes to enable
error[E0658]: rust-cold is experimental and subject to change
--> $DIR/feature-gate-rust_cold_cc.rs:16:12
|
LL | extern "rust-cold" fn imu() {}
| ^^^^^^^^^^^
|
= note: see issue #97544 <https://github.com/rust-lang/rust/issues/97544> for more information
= help: add `#![feature(rust_cold_cc)]` to the crate attributes to enable
error[E0658]: rust-cold is experimental and subject to change
--> $DIR/feature-gate-rust_cold_cc.rs:19:19
|
LL | type TAU = extern "rust-cold" fn();
| ^^^^^^^^^^^
|
= note: see issue #97544 <https://github.com/rust-lang/rust/issues/97544> for more information
= help: add `#![feature(rust_cold_cc)]` to the crate attributes to enable
error[E0658]: rust-cold is experimental and subject to change
--> $DIR/feature-gate-rust_cold_cc.rs:21:8
|
LL | extern "rust-cold" {}
| ^^^^^^^^^^^
|
= note: see issue #97544 <https://github.com/rust-lang/rust/issues/97544> for more information
= help: add `#![feature(rust_cold_cc)]` to the crate attributes to enable
error: aborting due to 7 previous errors
For more information about this error, try `rustc --explain E0658`.