Skip to content

Commit 71c4b24

Browse files
committed
Remove invalid Conv
1 parent c8197b7 commit 71c4b24

File tree

1 file changed

+8
-9
lines changed
  • compiler/rustc_target/src/callconv

1 file changed

+8
-9
lines changed

compiler/rustc_target/src/callconv/mod.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -900,22 +900,21 @@ impl FromStr for Conv {
900900

901901
fn conv_to_externabi(conv: &Conv) -> ExternAbi {
902902
match conv {
903+
Conv::C => ExternAbi::C { unwind: false },
903904
Conv::Rust => ExternAbi::Rust,
904905
Conv::PreserveMost => ExternAbi::RustCold,
905-
Conv::X86Stdcall => ExternAbi::Stdcall { unwind: false },
906-
Conv::X86Fastcall => ExternAbi::Fastcall { unwind: false },
907-
Conv::X86VectorCall => ExternAbi::Vectorcall { unwind: false },
908-
Conv::X86ThisCall => ExternAbi::Thiscall { unwind: false },
909-
Conv::C => ExternAbi::C { unwind: false },
910-
Conv::X86_64Win64 => ExternAbi::Win64 { unwind: false },
911-
Conv::X86_64SysV => ExternAbi::SysV64 { unwind: false },
912906
Conv::ArmAapcs => ExternAbi::Aapcs { unwind: false },
913907
Conv::CCmseNonSecureCall => ExternAbi::CCmseNonSecureCall,
914908
Conv::CCmseNonSecureEntry => ExternAbi::CCmseNonSecureEntry,
915-
Conv::PtxKernel => ExternAbi::PtxKernel,
916909
Conv::Msp430Intr => ExternAbi::Msp430Interrupt,
917-
Conv::X86Intr => ExternAbi::X86Interrupt,
918910
Conv::GpuKernel => ExternAbi::GpuKernel,
911+
Conv::X86Fastcall => ExternAbi::Fastcall { unwind: false },
912+
Conv::X86Intr => ExternAbi::X86Interrupt,
913+
Conv::X86Stdcall => ExternAbi::Stdcall { unwind: false },
914+
Conv::X86ThisCall => ExternAbi::Thiscall { unwind: false },
915+
Conv::X86VectorCall => ExternAbi::Vectorcall { unwind: false },
916+
Conv::X86_64SysV => ExternAbi::SysV64 { unwind: false },
917+
Conv::X86_64Win64 => ExternAbi::Win64 { unwind: false },
919918
Conv::AvrInterrupt => ExternAbi::AvrInterrupt,
920919
Conv::AvrNonBlockingInterrupt => ExternAbi::AvrNonBlockingInterrupt,
921920
Conv::RiscvInterrupt { kind: RiscvInterruptKind::Machine } => ExternAbi::RiscvInterruptM,

0 commit comments

Comments
 (0)