Skip to content

Commit 6c16a31

Browse files
workingjubileeworkingjubilee
committed
compiler: Directly use rustc_abi in smir again
1 parent 843b6e0 commit 6c16a31

File tree

4 files changed

+58
-58
lines changed

4 files changed

+58
-58
lines changed

‎compiler/rustc_smir/src/rustc_internal/internal.rs

+29-29
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ impl RustcInternal for FnSig {
237237
}
238238

239239
impl RustcInternal for VariantIdx {
240-
type T<'tcx> = rustc_target::abi::VariantIdx;
240+
type T<'tcx> = rustc_abi::VariantIdx;
241241

242242
fn internal<'tcx>(&self, _tables: &mut Tables<'_>, _tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
243-
rustc_target::abi::VariantIdx::from(self.to_index())
243+
rustc_abi::VariantIdx::from(self.to_index())
244244
}
245245
}
246246

@@ -451,35 +451,35 @@ impl RustcInternal for AdtDef {
451451
}
452452

453453
impl RustcInternal for Abi {
454-
type T<'tcx> = rustc_target::spec::abi::Abi;
454+
type T<'tcx> = rustc_abi::ExternAbi;
455455

456456
fn internal<'tcx>(&self, _tables: &mut Tables<'_>, _tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
457457
match *self {
458-
Abi::Rust => rustc_target::spec::abi::Abi::Rust,
459-
Abi::C { unwind } => rustc_target::spec::abi::Abi::C { unwind },
460-
Abi::Cdecl { unwind } => rustc_target::spec::abi::Abi::Cdecl { unwind },
461-
Abi::Stdcall { unwind } => rustc_target::spec::abi::Abi::Stdcall { unwind },
462-
Abi::Fastcall { unwind } => rustc_target::spec::abi::Abi::Fastcall { unwind },
463-
Abi::Vectorcall { unwind } => rustc_target::spec::abi::Abi::Vectorcall { unwind },
464-
Abi::Thiscall { unwind } => rustc_target::spec::abi::Abi::Thiscall { unwind },
465-
Abi::Aapcs { unwind } => rustc_target::spec::abi::Abi::Aapcs { unwind },
466-
Abi::Win64 { unwind } => rustc_target::spec::abi::Abi::Win64 { unwind },
467-
Abi::SysV64 { unwind } => rustc_target::spec::abi::Abi::SysV64 { unwind },
468-
Abi::PtxKernel => rustc_target::spec::abi::Abi::PtxKernel,
469-
Abi::Msp430Interrupt => rustc_target::spec::abi::Abi::Msp430Interrupt,
470-
Abi::X86Interrupt => rustc_target::spec::abi::Abi::X86Interrupt,
471-
Abi::EfiApi => rustc_target::spec::abi::Abi::EfiApi,
472-
Abi::AvrInterrupt => rustc_target::spec::abi::Abi::AvrInterrupt,
473-
Abi::AvrNonBlockingInterrupt => rustc_target::spec::abi::Abi::AvrNonBlockingInterrupt,
474-
Abi::CCmseNonSecureCall => rustc_target::spec::abi::Abi::CCmseNonSecureCall,
475-
Abi::CCmseNonSecureEntry => rustc_target::spec::abi::Abi::CCmseNonSecureEntry,
476-
Abi::System { unwind } => rustc_target::spec::abi::Abi::System { unwind },
477-
Abi::RustIntrinsic => rustc_target::spec::abi::Abi::RustIntrinsic,
478-
Abi::RustCall => rustc_target::spec::abi::Abi::RustCall,
479-
Abi::Unadjusted => rustc_target::spec::abi::Abi::Unadjusted,
480-
Abi::RustCold => rustc_target::spec::abi::Abi::RustCold,
481-
Abi::RiscvInterruptM => rustc_target::spec::abi::Abi::RiscvInterruptM,
482-
Abi::RiscvInterruptS => rustc_target::spec::abi::Abi::RiscvInterruptS,
458+
Abi::Rust => rustc_abi::ExternAbi::Rust,
459+
Abi::C { unwind } => rustc_abi::ExternAbi::C { unwind },
460+
Abi::Cdecl { unwind } => rustc_abi::ExternAbi::Cdecl { unwind },
461+
Abi::Stdcall { unwind } => rustc_abi::ExternAbi::Stdcall { unwind },
462+
Abi::Fastcall { unwind } => rustc_abi::ExternAbi::Fastcall { unwind },
463+
Abi::Vectorcall { unwind } => rustc_abi::ExternAbi::Vectorcall { unwind },
464+
Abi::Thiscall { unwind } => rustc_abi::ExternAbi::Thiscall { unwind },
465+
Abi::Aapcs { unwind } => rustc_abi::ExternAbi::Aapcs { unwind },
466+
Abi::Win64 { unwind } => rustc_abi::ExternAbi::Win64 { unwind },
467+
Abi::SysV64 { unwind } => rustc_abi::ExternAbi::SysV64 { unwind },
468+
Abi::PtxKernel => rustc_abi::ExternAbi::PtxKernel,
469+
Abi::Msp430Interrupt => rustc_abi::ExternAbi::Msp430Interrupt,
470+
Abi::X86Interrupt => rustc_abi::ExternAbi::X86Interrupt,
471+
Abi::EfiApi => rustc_abi::ExternAbi::EfiApi,
472+
Abi::AvrInterrupt => rustc_abi::ExternAbi::AvrInterrupt,
473+
Abi::AvrNonBlockingInterrupt => rustc_abi::ExternAbi::AvrNonBlockingInterrupt,
474+
Abi::CCmseNonSecureCall => rustc_abi::ExternAbi::CCmseNonSecureCall,
475+
Abi::CCmseNonSecureEntry => rustc_abi::ExternAbi::CCmseNonSecureEntry,
476+
Abi::System { unwind } => rustc_abi::ExternAbi::System { unwind },
477+
Abi::RustIntrinsic => rustc_abi::ExternAbi::RustIntrinsic,
478+
Abi::RustCall => rustc_abi::ExternAbi::RustCall,
479+
Abi::Unadjusted => rustc_abi::ExternAbi::Unadjusted,
480+
Abi::RustCold => rustc_abi::ExternAbi::RustCold,
481+
Abi::RiscvInterruptM => rustc_abi::ExternAbi::RiscvInterruptM,
482+
Abi::RiscvInterruptS => rustc_abi::ExternAbi::RiscvInterruptS,
483483
}
484484
}
485485
}
@@ -503,7 +503,7 @@ impl RustcInternal for Span {
503503
}
504504

505505
impl RustcInternal for Layout {
506-
type T<'tcx> = rustc_target::abi::Layout<'tcx>;
506+
type T<'tcx> = rustc_abi::Layout<'tcx>;
507507

508508
fn internal<'tcx>(&self, tables: &mut Tables<'_>, tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
509509
tcx.lift(tables.layouts[*self]).unwrap()

‎compiler/rustc_smir/src/rustc_smir/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ pub(crate) struct TablesWrapper<'tcx>(pub RefCell<Tables<'tcx>>);
786786

787787
/// Implement error handling for extracting function ABI information.
788788
impl<'tcx> FnAbiOfHelpers<'tcx> for Tables<'tcx> {
789-
type FnAbiOfResult = Result<&'tcx rustc_target::abi::call::FnAbi<'tcx, ty::Ty<'tcx>>, Error>;
789+
type FnAbiOfResult = Result<&'tcx rustc_target::callconv::FnAbi<'tcx, ty::Ty<'tcx>>, Error>;
790790

791791
#[inline]
792792
fn handle_fn_abi_err(

‎compiler/rustc_smir/src/rustc_smir/convert/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Conversion of internal Rust compiler items to stable ones.
22
3-
use rustc_target::abi::FieldIdx;
3+
use rustc_abi::FieldIdx;
44

55
use crate::rustc_smir::{Stable, Tables};
66

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

+27-27
Original file line numberDiff line numberDiff line change
@@ -891,38 +891,38 @@ impl<'tcx> Stable<'tcx> for ty::Movability {
891891
}
892892
}
893893

894-
impl<'tcx> Stable<'tcx> for rustc_target::spec::abi::Abi {
894+
impl<'tcx> Stable<'tcx> for rustc_abi::ExternAbi {
895895
type T = stable_mir::ty::Abi;
896896

897897
fn stable(&self, _: &mut Tables<'_>) -> Self::T {
898-
use rustc_target::spec::abi;
898+
use rustc_abi::ExternAbi;
899899
use stable_mir::ty::Abi;
900900
match *self {
901-
abi::Abi::Rust => Abi::Rust,
902-
abi::Abi::C { unwind } => Abi::C { unwind },
903-
abi::Abi::Cdecl { unwind } => Abi::Cdecl { unwind },
904-
abi::Abi::Stdcall { unwind } => Abi::Stdcall { unwind },
905-
abi::Abi::Fastcall { unwind } => Abi::Fastcall { unwind },
906-
abi::Abi::Vectorcall { unwind } => Abi::Vectorcall { unwind },
907-
abi::Abi::Thiscall { unwind } => Abi::Thiscall { unwind },
908-
abi::Abi::Aapcs { unwind } => Abi::Aapcs { unwind },
909-
abi::Abi::Win64 { unwind } => Abi::Win64 { unwind },
910-
abi::Abi::SysV64 { unwind } => Abi::SysV64 { unwind },
911-
abi::Abi::PtxKernel => Abi::PtxKernel,
912-
abi::Abi::Msp430Interrupt => Abi::Msp430Interrupt,
913-
abi::Abi::X86Interrupt => Abi::X86Interrupt,
914-
abi::Abi::EfiApi => Abi::EfiApi,
915-
abi::Abi::AvrInterrupt => Abi::AvrInterrupt,
916-
abi::Abi::AvrNonBlockingInterrupt => Abi::AvrNonBlockingInterrupt,
917-
abi::Abi::CCmseNonSecureCall => Abi::CCmseNonSecureCall,
918-
abi::Abi::CCmseNonSecureEntry => Abi::CCmseNonSecureEntry,
919-
abi::Abi::System { unwind } => Abi::System { unwind },
920-
abi::Abi::RustIntrinsic => Abi::RustIntrinsic,
921-
abi::Abi::RustCall => Abi::RustCall,
922-
abi::Abi::Unadjusted => Abi::Unadjusted,
923-
abi::Abi::RustCold => Abi::RustCold,
924-
abi::Abi::RiscvInterruptM => Abi::RiscvInterruptM,
925-
abi::Abi::RiscvInterruptS => Abi::RiscvInterruptS,
901+
ExternAbi::Rust => Abi::Rust,
902+
ExternAbi::C { unwind } => Abi::C { unwind },
903+
ExternAbi::Cdecl { unwind } => Abi::Cdecl { unwind },
904+
ExternAbi::Stdcall { unwind } => Abi::Stdcall { unwind },
905+
ExternAbi::Fastcall { unwind } => Abi::Fastcall { unwind },
906+
ExternAbi::Vectorcall { unwind } => Abi::Vectorcall { unwind },
907+
ExternAbi::Thiscall { unwind } => Abi::Thiscall { unwind },
908+
ExternAbi::Aapcs { unwind } => Abi::Aapcs { unwind },
909+
ExternAbi::Win64 { unwind } => Abi::Win64 { unwind },
910+
ExternAbi::SysV64 { unwind } => Abi::SysV64 { unwind },
911+
ExternAbi::PtxKernel => Abi::PtxKernel,
912+
ExternAbi::Msp430Interrupt => Abi::Msp430Interrupt,
913+
ExternAbi::X86Interrupt => Abi::X86Interrupt,
914+
ExternAbi::EfiApi => Abi::EfiApi,
915+
ExternAbi::AvrInterrupt => Abi::AvrInterrupt,
916+
ExternAbi::AvrNonBlockingInterrupt => Abi::AvrNonBlockingInterrupt,
917+
ExternAbi::CCmseNonSecureCall => Abi::CCmseNonSecureCall,
918+
ExternAbi::CCmseNonSecureEntry => Abi::CCmseNonSecureEntry,
919+
ExternAbi::System { unwind } => Abi::System { unwind },
920+
ExternAbi::RustIntrinsic => Abi::RustIntrinsic,
921+
ExternAbi::RustCall => Abi::RustCall,
922+
ExternAbi::Unadjusted => Abi::Unadjusted,
923+
ExternAbi::RustCold => Abi::RustCold,
924+
ExternAbi::RiscvInterruptM => Abi::RiscvInterruptM,
925+
ExternAbi::RiscvInterruptS => Abi::RiscvInterruptS,
926926
}
927927
}
928928
}

0 commit comments

Comments
 (0)