Rollup merge of rust-lang#120495 - clubby789:remove-amdgpu-kernel, r=…

…oli-obk Remove the `abi_amdgpu_kernel` feature The tracking issue (rust-lang#51575) has been closed for 3 years, with no activity for 5.
Nadrieril · Jan 31, 2024 · 573e7f1 · 573e7f1
2 parents be4f8e2 f6b21e9
commit 573e7f1
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 268 deletions.
diff --git a/compiler/rustc_codegen_cranelift/src/abi/mod.rs b/compiler/rustc_codegen_cranelift/src/abi/mod.rs
@@ -56,11 56,7 @@ pub(crate) fn conv_to_call_conv(sess: &Session, c: Conv, default_call_conv: Call
  sess.dcx().fatal("C-cmse-nonsecure-call call conv is not yet implemented");
  }
 
- Conv::Msp430Intr
- | Conv::PtxKernel
- | Conv::AmdGpuKernel
- | Conv::AvrInterrupt
- | Conv::AvrNonBlockingInterrupt => {
  Conv::Msp430Intr | Conv::PtxKernel | Conv::AvrInterrupt | Conv::AvrNonBlockingInterrupt => {
  unreachable!("tried to use {c:?} call conv which only exists on an unsupported target");
  }
  }

diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs
@@ -590,7 590,6 @@ impl From<Conv> for llvm::CallConv {
  Conv::Cold => llvm::ColdCallConv,
  Conv::PreserveMost => llvm::PreserveMost,
  Conv::PreserveAll => llvm::PreserveAll,
- Conv::AmdGpuKernel => llvm::AmdGpuKernel,
  Conv::AvrInterrupt => llvm::AvrInterrupt,
  Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt,
  Conv::ArmAapcs => llvm::ArmAapcsCallConv,

diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs
@@ -106,7 106,6 @@ pub enum CallConv {
  X86_Intr = 83,
  AvrNonBlockingInterrupt = 84,
  AvrInterrupt = 85,
- AmdGpuKernel = 91,
 }
 
 /// LLVMRustLinkage

diff --git a/compiler/rustc_feature/src/removed.rs b/compiler/rustc_feature/src/removed.rs
@@ -32,6 32,8 @@ declare_features! (
  // feature-group-start: removed features
  // -------------------------------------------------------------------------
 
  /// Allows using the `amdgpu-kernel` ABI.
  (removed, abi_amdgpu_kernel, "CURRENT_RUSTC_VERSION", Some(51575), None),
  (removed, advanced_slice_patterns, "1.0.0", Some(62254),
  Some("merged into `#![feature(slice_patterns)]`")),
  (removed, allocator, "1.0.0", None, None),

diff --git a/compiler/rustc_feature/src/unstable.rs b/compiler/rustc_feature/src/unstable.rs
@@ -321,8 321,6 @@ declare_features! (
  // feature-group-start: actual feature gates
  // -------------------------------------------------------------------------
 
- /// Allows using the `amdgpu-kernel` ABI.
- (unstable, abi_amdgpu_kernel, "1.29.0", Some(51575)),
  /// Allows `extern "avr-interrupt" fn()` and `extern "avr-non-blocking-interrupt" fn()`.
  (unstable, abi_avr_interrupt, "1.45.0", Some(69664)),
  /// Allows `extern "C-cmse-nonsecure-call" fn()`.

diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs
@@ -1247,7 1247,6 @@ pub fn fn_can_unwind(tcx: TyCtxt<'_>, fn_def_id: Option<DefId>, abi: SpecAbi) ->
  PtxKernel
  | Msp430Interrupt
  | X86Interrupt
- | AmdGpuKernel
  | EfiApi
  | AvrInterrupt
  | AvrNonBlockingInterrupt

diff --git a/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs b/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs
@@ -26,7 26,6 @@ fn abi_can_unwind(abi: Abi) -> bool {
  PtxKernel
  | Msp430Interrupt
  | X86Interrupt
- | AmdGpuKernel
  | EfiApi
  | AvrInterrupt
  | AvrNonBlockingInterrupt

diff --git a/compiler/rustc_smir/src/rustc_internal/internal.rs b/compiler/rustc_smir/src/rustc_internal/internal.rs
@@ -449,7 449,6 @@ impl RustcInternal for Abi {
  Abi::PtxKernel => rustc_target::spec::abi::Abi::PtxKernel,
  Abi::Msp430Interrupt => rustc_target::spec::abi::Abi::Msp430Interrupt,
  Abi::X86Interrupt => rustc_target::spec::abi::Abi::X86Interrupt,
- Abi::AmdGpuKernel => rustc_target::spec::abi::Abi::AmdGpuKernel,
  Abi::EfiApi => rustc_target::spec::abi::Abi::EfiApi,
  Abi::AvrInterrupt => rustc_target::spec::abi::Abi::AvrInterrupt,
  Abi::AvrNonBlockingInterrupt => rustc_target::spec::abi::Abi::AvrNonBlockingInterrupt,

diff --git a/compiler/rustc_smir/src/rustc_smir/convert/abi.rs b/compiler/rustc_smir/src/rustc_smir/convert/abi.rs
@@ -111,7 111,6 @@ impl<'tcx> Stable<'tcx> for rustc_target::abi::call::Conv {
  Conv::X86VectorCall => CallConvention::X86VectorCall,
  Conv::X86_64SysV => CallConvention::X86_64SysV,
  Conv::X86_64Win64 => CallConvention::X86_64Win64,
- Conv::AmdGpuKernel => CallConvention::AmdGpuKernel,
  Conv::AvrInterrupt => CallConvention::AvrInterrupt,
  Conv::AvrNonBlockingInterrupt => CallConvention::AvrNonBlockingInterrupt,
  Conv::RiscvInterrupt { .. } => CallConvention::RiscvInterrupt,

diff --git a/compiler/rustc_smir/src/rustc_smir/convert/ty.rs b/compiler/rustc_smir/src/rustc_smir/convert/ty.rs
@@ -223,7 223,6 @@ impl<'tcx> Stable<'tcx> for ty::FnSig<'tcx> {
  abi::Abi::PtxKernel => Abi::PtxKernel,
  abi::Abi::Msp430Interrupt => Abi::Msp430Interrupt,
  abi::Abi::X86Interrupt => Abi::X86Interrupt,
- abi::Abi::AmdGpuKernel => Abi::AmdGpuKernel,
  abi::Abi::EfiApi => Abi::EfiApi,
  abi::Abi::AvrInterrupt => Abi::AvrInterrupt,
  abi::Abi::AvrNonBlockingInterrupt => Abi::AvrNonBlockingInterrupt,

diff --git a/compiler/rustc_target/src/abi/call/mod.rs b/compiler/rustc_target/src/abi/call/mod.rs
@@ -705,7 705,6 @@ pub enum Conv {
  X86_64SysV,
  X86_64Win64,
 
- AmdGpuKernel,
  AvrInterrupt,
  AvrNonBlockingInterrupt,
 
@@ -887,7 886,6 @@ impl FromStr for Conv {
  "X86VectorCall" => Ok(Conv::X86VectorCall),
  "X86_64SysV" => Ok(Conv::X86_64SysV),
  "X86_64Win64" => Ok(Conv::X86_64Win64),
- "AmdGpuKernel" => Ok(Conv::AmdGpuKernel),
  "AvrInterrupt" => Ok(Conv::AvrInterrupt),
  "AvrNonBlockingInterrupt" => Ok(Conv::AvrNonBlockingInterrupt),
  "RiscvInterrupt(machine)" => {

diff --git a/compiler/rustc_target/src/json.rs b/compiler/rustc_target/src/json.rs
@@ -110,7 110,6 @@ impl ToJson for crate::abi::call::Conv {
  Self::X86VectorCall => "X86VectorCall",
  Self::X86_64SysV => "X86_64SysV",
  Self::X86_64Win64 => "X86_64Win64",
- Self::AmdGpuKernel => "AmdGpuKernel",
  Self::AvrInterrupt => "AvrInterrupt",
  Self::AvrNonBlockingInterrupt => "AvrNonBlockingInterrupt",
  Self::RiscvInterrupt { kind } => {

diff --git a/compiler/rustc_target/src/spec/abi/mod.rs b/compiler/rustc_target/src/spec/abi/mod.rs
@@ -44,7 44,6 @@ pub enum Abi {
  PtxKernel,
  Msp430Interrupt,
  X86Interrupt,
- AmdGpuKernel,
  EfiApi,
  AvrInterrupt,
  AvrNonBlockingInterrupt,
@@ -121,7 120,6 @@ const AbiDatas: &[AbiData] = &[
  AbiData { abi: Abi::PtxKernel, name: "ptx-kernel" },
  AbiData { abi: Abi::Msp430Interrupt, name: "msp430-interrupt" },
  AbiData { abi: Abi::X86Interrupt, name: "x86-interrupt" },
- AbiData { abi: Abi::AmdGpuKernel, name: "amdgpu-kernel" },
  AbiData { abi: Abi::EfiApi, name: "efiapi" },
  AbiData { abi: Abi::AvrInterrupt, name: "avr-interrupt" },
  AbiData { abi: Abi::AvrNonBlockingInterrupt, name: "avr-non-blocking-interrupt" },
@@ -237,10 235,6 @@ pub fn is_stable(name: &str) -> Result<(), AbiDisabled> {
  feature: sym::abi_x86_interrupt,
  explain: "x86-interrupt ABI is experimental and subject to change",
  }),
- "amdgpu-kernel" => Err(AbiDisabled::Unstable {
- feature: sym::abi_amdgpu_kernel,
- explain: "amdgpu-kernel ABI is experimental and subject to change",
- }),
  "avr-interrupt" | "avr-non-blocking-interrupt" => Err(AbiDisabled::Unstable {
  feature: sym::abi_avr_interrupt,
  explain: "avr-interrupt and avr-non-blocking-interrupt ABIs are experimental and subject to change",
@@ -295,22 289,21 @@ impl Abi {
  PtxKernel => 19,
  Msp430Interrupt => 20,
  X86Interrupt => 21,
- AmdGpuKernel => 22,
- EfiApi => 23,
- AvrInterrupt => 24,
- AvrNonBlockingInterrupt => 25,
- CCmseNonSecureCall => 26,
- Wasm => 27,
  EfiApi => 22,
  AvrInterrupt => 23,
  AvrNonBlockingInterrupt => 24,
  CCmseNonSecureCall => 25,
  Wasm => 26,
  // Cross-platform ABIs
- System { unwind: false } => 28,
- System { unwind: true } => 29,
- RustIntrinsic => 30,
- RustCall => 31,
- PlatformIntrinsic => 32,
- Unadjusted => 33,
- RustCold => 34,
- RiscvInterruptM => 35,
- RiscvInterruptS => 36,
  System { unwind: false } => 27,
  System { unwind: true } => 28,
  RustIntrinsic => 29,
  RustCall => 30,
  PlatformIntrinsic => 31,
  Unadjusted => 32,
  RustCold => 33,
  RiscvInterruptM => 34,
  RiscvInterruptS => 35,
  };
  debug_assert!(
  AbiDatas

diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
@@ -2457,7 2457,6 @@ impl Target {
  Win64 { .. } | SysV64 { .. } => self.arch == "x86_64",
  PtxKernel => self.arch == "nvptx64",
  Msp430Interrupt => self.arch == "msp430",
- AmdGpuKernel => self.arch == "amdgcn",
  RiscvInterruptM | RiscvInterruptS => ["riscv32", "riscv64"].contains(&&self.arch[..]),
  AvrInterrupt | AvrNonBlockingInterrupt => self.arch == "avr",
  Wasm => ["wasm32", "wasm64"].contains(&&self.arch[..]),

diff --git a/compiler/rustc_ty_utils/src/abi.rs b/compiler/rustc_ty_utils/src/abi.rs
@@ -258,7 258,6 @@ fn conv_from_spec_abi(tcx: TyCtxt<'_>, abi: SpecAbi, c_variadic: bool) -> Conv {
  PtxKernel => Conv::PtxKernel,
  Msp430Interrupt => Conv::Msp430Intr,
  X86Interrupt => Conv::X86Intr,
- AmdGpuKernel => Conv::AmdGpuKernel,
  AvrInterrupt => Conv::AvrInterrupt,
  AvrNonBlockingInterrupt => Conv::AvrNonBlockingInterrupt,
  RiscvInterruptM => Conv::RiscvInterrupt { kind: RiscvInterruptKind::Machine },

diff --git a/compiler/stable_mir/src/abi.rs b/compiler/stable_mir/src/abi.rs
@@ -275,7 275,6 @@ pub enum CallConvention {
  X86_64SysV,
  X86_64Win64,
 
- AmdGpuKernel,
  AvrInterrupt,
  AvrNonBlockingInterrupt,
 

diff --git a/compiler/stable_mir/src/ty.rs b/compiler/stable_mir/src/ty.rs
@@ -864,7 864,6 @@ pub enum Abi {
  PtxKernel,
  Msp430Interrupt,
  X86Interrupt,
- AmdGpuKernel,
  EfiApi,
  AvrInterrupt,
  AvrNonBlockingInterrupt,

diff --git a/tests/ui/abi/unsupported.aarch64.stderr b/tests/ui/abi/unsupported.aarch64.stderr
@@ -1,59 1,53 @@
 error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:30:1
  --> $DIR/unsupported.rs:29:1
  |
 LL | extern "ptx-kernel" fn ptx() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0570]: `"amdgpu-kernel"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:32:1
- |
-LL | extern "amdgpu-kernel" fn amdgpu() {}
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 error[E0570]: `"wasm"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:34:1
  --> $DIR/unsupported.rs:31:1
  |
 LL | extern "wasm" fn wasm() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"aapcs"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:36:1
  --> $DIR/unsupported.rs:33:1
  |
 LL | extern "aapcs" fn aapcs() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:42:1
  --> $DIR/unsupported.rs:39:1
  |
 LL | extern "msp430-interrupt" fn msp430() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:44:1
  --> $DIR/unsupported.rs:41:1
  |
 LL | extern "avr-interrupt" fn avr() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:46:1
  --> $DIR/unsupported.rs:43:1
  |
 LL | extern "riscv-interrupt-m" fn riscv() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:51:1
  --> $DIR/unsupported.rs:48:1
  |
 LL | extern "x86-interrupt" fn x86() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"thiscall"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:56:1
  --> $DIR/unsupported.rs:53:1
  |
 LL | extern "thiscall" fn thiscall() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 warning: use of calling convention not supported on this target
- --> $DIR/unsupported.rs:62:1
  --> $DIR/unsupported.rs:59:1
  |
 LL | extern "stdcall" fn stdcall() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -62,6 56,6 @@ LL | extern "stdcall" fn stdcall() {}
  = note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
  = note: `#[warn(unsupported_calling_conventions)]` on by default
 
-error: aborting due to 9 previous errors; 1 warning emitted
 error: aborting due to 8 previous errors; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0570`.
diff --git a/tests/ui/abi/unsupported.arm.stderr b/tests/ui/abi/unsupported.arm.stderr
@@ -1,53 1,47 @@
 error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:30:1
  --> $DIR/unsupported.rs:29:1
  |
 LL | extern "ptx-kernel" fn ptx() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0570]: `"amdgpu-kernel"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:32:1
- |
-LL | extern "amdgpu-kernel" fn amdgpu() {}
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 error[E0570]: `"wasm"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:34:1
  --> $DIR/unsupported.rs:31:1
  |
 LL | extern "wasm" fn wasm() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:42:1
  --> $DIR/unsupported.rs:39:1
  |
 LL | extern "msp430-interrupt" fn msp430() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:44:1
  --> $DIR/unsupported.rs:41:1
  |
 LL | extern "avr-interrupt" fn avr() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:46:1
  --> $DIR/unsupported.rs:43:1
  |
 LL | extern "riscv-interrupt-m" fn riscv() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:51:1
  --> $DIR/unsupported.rs:48:1
  |
 LL | extern "x86-interrupt" fn x86() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0570]: `"thiscall"` is not a supported ABI for the current target
- --> $DIR/unsupported.rs:56:1
  --> $DIR/unsupported.rs:53:1
  |
 LL | extern "thiscall" fn thiscall() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 warning: use of calling convention not supported on this target
- --> $DIR/unsupported.rs:62:1
  --> $DIR/unsupported.rs:59:1
  |
 LL | extern "stdcall" fn stdcall() {}
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -56,6 50,6 @@ LL | extern "stdcall" fn stdcall() {}
  = note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
  = note: `#[warn(unsupported_calling_conventions)]` on by default
 
-error: aborting due to 8 previous errors; 1 warning emitted
 error: aborting due to 7 previous errors; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0570`.