Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit f6b21e9

Browse files
committed
Remove the abi_amdgpu_kernel feature
1 parent c401f09 commit f6b21e9

File tree

26 files changed

+70
-268
lines changed

26 files changed

+70
-268
lines changed

compiler/rustc_codegen_cranelift/src/abi/mod.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ pub(crate) fn conv_to_call_conv(sess: &Session, c: Conv, default_call_conv: Call
5656
sess.dcx().fatal("C-cmse-nonsecure-call call conv is not yet implemented");
5757
}
5858

59-
Conv::Msp430Intr
60-
| Conv::PtxKernel
61-
| Conv::AmdGpuKernel
62-
| Conv::AvrInterrupt
63-
| Conv::AvrNonBlockingInterrupt => {
59+
Conv::Msp430Intr | Conv::PtxKernel | Conv::AvrInterrupt | Conv::AvrNonBlockingInterrupt => {
6460
unreachable!("tried to use {c:?} call conv which only exists on an unsupported target");
6561
}
6662
}

compiler/rustc_codegen_llvm/src/abi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ impl From<Conv> for llvm::CallConv {
590590
Conv::Cold => llvm::ColdCallConv,
591591
Conv::PreserveMost => llvm::PreserveMost,
592592
Conv::PreserveAll => llvm::PreserveAll,
593-
Conv::AmdGpuKernel => llvm::AmdGpuKernel,
594593
Conv::AvrInterrupt => llvm::AvrInterrupt,
595594
Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt,
596595
Conv::ArmAapcs => llvm::ArmAapcsCallConv,

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ pub enum CallConv {
106106
X86_Intr = 83,
107107
AvrNonBlockingInterrupt = 84,
108108
AvrInterrupt = 85,
109-
AmdGpuKernel = 91,
110109
}
111110

112111
/// LLVMRustLinkage

compiler/rustc_feature/src/removed.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ declare_features! (
3232
// feature-group-start: removed features
3333
// -------------------------------------------------------------------------
3434

35+
/// Allows using the `amdgpu-kernel` ABI.
36+
(removed, abi_amdgpu_kernel, "CURRENT_RUSTC_VERSION", Some(51575), None),
3537
(removed, advanced_slice_patterns, "1.0.0", Some(62254),
3638
Some("merged into `#![feature(slice_patterns)]`")),
3739
(removed, allocator, "1.0.0", None, None),

compiler/rustc_feature/src/unstable.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,6 @@ declare_features! (
321321
// feature-group-start: actual feature gates
322322
// -------------------------------------------------------------------------
323323

324-
/// Allows using the `amdgpu-kernel` ABI.
325-
(unstable, abi_amdgpu_kernel, "1.29.0", Some(51575)),
326324
/// Allows `extern "avr-interrupt" fn()` and `extern "avr-non-blocking-interrupt" fn()`.
327325
(unstable, abi_avr_interrupt, "1.45.0", Some(69664)),
328326
/// Allows `extern "C-cmse-nonsecure-call" fn()`.

compiler/rustc_middle/src/ty/layout.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,6 @@ pub fn fn_can_unwind(tcx: TyCtxt<'_>, fn_def_id: Option<DefId>, abi: SpecAbi) ->
12471247
PtxKernel
12481248
| Msp430Interrupt
12491249
| X86Interrupt
1250-
| AmdGpuKernel
12511250
| EfiApi
12521251
| AvrInterrupt
12531252
| AvrNonBlockingInterrupt

compiler/rustc_mir_transform/src/ffi_unwind_calls.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ fn abi_can_unwind(abi: Abi) -> bool {
2626
PtxKernel
2727
| Msp430Interrupt
2828
| X86Interrupt
29-
| AmdGpuKernel
3029
| EfiApi
3130
| AvrInterrupt
3231
| AvrNonBlockingInterrupt

compiler/rustc_smir/src/rustc_internal/internal.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ impl RustcInternal for Abi {
449449
Abi::PtxKernel => rustc_target::spec::abi::Abi::PtxKernel,
450450
Abi::Msp430Interrupt => rustc_target::spec::abi::Abi::Msp430Interrupt,
451451
Abi::X86Interrupt => rustc_target::spec::abi::Abi::X86Interrupt,
452-
Abi::AmdGpuKernel => rustc_target::spec::abi::Abi::AmdGpuKernel,
453452
Abi::EfiApi => rustc_target::spec::abi::Abi::EfiApi,
454453
Abi::AvrInterrupt => rustc_target::spec::abi::Abi::AvrInterrupt,
455454
Abi::AvrNonBlockingInterrupt => rustc_target::spec::abi::Abi::AvrNonBlockingInterrupt,

compiler/rustc_smir/src/rustc_smir/convert/abi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ impl<'tcx> Stable<'tcx> for rustc_target::abi::call::Conv {
111111
Conv::X86VectorCall => CallConvention::X86VectorCall,
112112
Conv::X86_64SysV => CallConvention::X86_64SysV,
113113
Conv::X86_64Win64 => CallConvention::X86_64Win64,
114-
Conv::AmdGpuKernel => CallConvention::AmdGpuKernel,
115114
Conv::AvrInterrupt => CallConvention::AvrInterrupt,
116115
Conv::AvrNonBlockingInterrupt => CallConvention::AvrNonBlockingInterrupt,
117116
Conv::RiscvInterrupt { .. } => CallConvention::RiscvInterrupt,

compiler/rustc_smir/src/rustc_smir/convert/ty.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ impl<'tcx> Stable<'tcx> for ty::FnSig<'tcx> {
223223
abi::Abi::PtxKernel => Abi::PtxKernel,
224224
abi::Abi::Msp430Interrupt => Abi::Msp430Interrupt,
225225
abi::Abi::X86Interrupt => Abi::X86Interrupt,
226-
abi::Abi::AmdGpuKernel => Abi::AmdGpuKernel,
227226
abi::Abi::EfiApi => Abi::EfiApi,
228227
abi::Abi::AvrInterrupt => Abi::AvrInterrupt,
229228
abi::Abi::AvrNonBlockingInterrupt => Abi::AvrNonBlockingInterrupt,

0 commit comments

Comments
 (0)