diff options
| author | Laurențiu Nicola <lnicola@users.noreply.github.com> | 2025-02-17 12:30:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-17 12:30:13 +0000 |
| commit | 0c9c489355a25ad6c89f6b009743a780b2ac97bd (patch) | |
| tree | 7dc4e427cc53a909fe61c9f68086084073a58fff /compiler/rustc_codegen_llvm/src/abi.rs | |
| parent | 2a0d16f3c481cdf28366f88d3824f4a30ff806c9 (diff) | |
| parent | 952bfae057206f01c3afd126752389eef353b56a (diff) | |
| download | rust-0c9c489355a25ad6c89f6b009743a780b2ac97bd.tar.gz rust-0c9c489355a25ad6c89f6b009743a780b2ac97bd.zip | |
Merge pull request #19169 from lnicola/sync-from-rust
minor: Sync from downstream
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/abi.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/abi.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs index 685b2f37c9c..28f423efc21 100644 --- a/compiler/rustc_codegen_llvm/src/abi.rs +++ b/compiler/rustc_codegen_llvm/src/abi.rs @@ -664,7 +664,7 @@ impl<'tcx> AbiBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> { } impl llvm::CallConv { - pub fn from_conv(conv: Conv, arch: &str) -> Self { + pub(crate) fn from_conv(conv: Conv, arch: &str) -> Self { match conv { Conv::C | Conv::Rust @@ -687,7 +687,6 @@ impl llvm::CallConv { Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt, Conv::ArmAapcs => llvm::ArmAapcsCallConv, Conv::Msp430Intr => llvm::Msp430Intr, - Conv::PtxKernel => llvm::PtxKernel, Conv::X86Fastcall => llvm::X86FastcallCallConv, Conv::X86Intr => llvm::X86_Intr, Conv::X86Stdcall => llvm::X86StdcallCallConv, |