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

Commit bbd18e2

Browse files
workingjubileeworkingjubilee
committed
compiler: Directly use rustc_abi in const_eval
1 parent b895bf4 commit bbd18e2

File tree

17 files changed

+29
-32
lines changed

17 files changed

+29
-32
lines changed

‎compiler/rustc_const_eval/src/const_eval/dummy_machine.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl<'tcx> interpret::Machine<'tcx> for DummyMachine {
8686
fn find_mir_or_eval_fn(
8787
_ecx: &mut InterpCx<'tcx, Self>,
8888
_instance: ty::Instance<'tcx>,
89-
_abi: rustc_target::spec::abi::Abi,
89+
_abi: rustc_abi::ExternAbi,
9090
_args: &[interpret::FnArg<'tcx, Self::Provenance>],
9191
_destination: &interpret::MPlaceTy<'tcx, Self::Provenance>,
9292
_target: Option<BasicBlock>,

‎compiler/rustc_const_eval/src/const_eval/machine.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use std::fmt;
33
use std::hash::Hash;
44
use std::ops::ControlFlow;
55

6+
use rustc_abi::{Align, ExternAbi, Size};
67
use rustc_ast::Mutability;
78
use rustc_data_structures::fx::{FxHashMap, FxIndexMap, IndexEntry};
89
use rustc_hir::def_id::{DefId, LocalDefId};
@@ -14,8 +15,6 @@ use rustc_middle::ty::{self, Ty, TyCtxt};
1415
use rustc_middle::{bug, mir};
1516
use rustc_span::Span;
1617
use rustc_span::symbol::{Symbol, sym};
17-
use rustc_target::abi::{Align, Size};
18-
use rustc_target::spec::abi::Abi as CallAbi;
1918
use tracing::debug;
2019

2120
use super::error::*;
@@ -411,7 +410,7 @@ impl<'tcx> interpret::Machine<'tcx> for CompileTimeMachine<'tcx> {
411410
fn find_mir_or_eval_fn(
412411
ecx: &mut InterpCx<'tcx, Self>,
413412
orig_instance: ty::Instance<'tcx>,
414-
_abi: CallAbi,
413+
_abi: ExternAbi,
415414
args: &[FnArg<'tcx>],
416415
dest: &MPlaceTy<'tcx>,
417416
ret: Option<mir::BasicBlock>,

‎compiler/rustc_const_eval/src/const_eval/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Not in interpret to make sure we do not use private implementation details
22

3+
use rustc_abi::VariantIdx;
34
use rustc_middle::query::{Key, TyCtxtAt};
45
use rustc_middle::ty::{self, Ty, TyCtxt};
56
use rustc_middle::{bug, mir};
6-
use rustc_target::abi::VariantIdx;
77
use tracing::instrument;
88

99
use crate::interpret::InterpCx;

‎compiler/rustc_const_eval/src/errors.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use std::borrow::Cow;
22
use std::fmt::Write;
33

44
use either::Either;
5+
use rustc_abi::WrappingRange;
56
use rustc_errors::codes::*;
67
use rustc_errors::{
78
Diag, DiagArgValue, DiagCtxtHandle, DiagMessage, Diagnostic, EmissionGuarantee, Level,
@@ -15,8 +16,7 @@ use rustc_middle::mir::interpret::{
1516
};
1617
use rustc_middle::ty::{self, Mutability, Ty};
1718
use rustc_span::{Span, Symbol};
18-
use rustc_target::abi::WrappingRange;
19-
use rustc_target::abi::call::AdjustForForeignAbiError;
19+
use rustc_target::callconv::AdjustForForeignAbiError;
2020

2121
use crate::interpret::InternKind;
2222

‎compiler/rustc_const_eval/src/interpret/call.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ use std::assert_matches::assert_matches;
44
use std::borrow::Cow;
55

66
use either::{Left, Right};
7+
use rustc_abi::{self as abi, ExternAbi, FieldIdx, Integer};
78
use rustc_middle::ty::layout::{FnAbiOf, IntegerExt, LayoutOf, TyAndLayout};
89
use rustc_middle::ty::{self, AdtDef, Instance, Ty};
910
use rustc_middle::{bug, mir, span_bug};
1011
use rustc_span::sym;
11-
use rustc_target::abi::call::{ArgAbi, FnAbi, PassMode};
12-
use rustc_target::abi::{self, FieldIdx, Integer};
13-
use rustc_target::spec::abi::Abi;
12+
use rustc_target::callconv::{ArgAbi, FnAbi, PassMode};
1413
use tracing::{info, instrument, trace};
1514

1615
use super::{
@@ -488,7 +487,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
488487
pub(super) fn init_fn_call(
489488
&mut self,
490489
fn_val: FnVal<'tcx, M::ExtraFnVal>,
491-
(caller_abi, caller_fn_abi): (Abi, &FnAbi<'tcx, Ty<'tcx>>),
490+
(caller_abi, caller_fn_abi): (ExternAbi, &FnAbi<'tcx, Ty<'tcx>>),
492491
args: &[FnArg<'tcx, M::Provenance>],
493492
with_caller_location: bool,
494493
destination: &MPlaceTy<'tcx, M::Provenance>,
@@ -566,7 +565,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
566565

567566
// Special handling for the closure ABI: untuple the last argument.
568567
let args: Cow<'_, [FnArg<'tcx, M::Provenance>]> =
569-
if caller_abi == Abi::RustCall && !args.is_empty() {
568+
if caller_abi == ExternAbi::RustCall && !args.is_empty() {
570569
// Untuple
571570
let (untuple_arg, args) = args.split_last().unwrap();
572571
trace!("init_fn_call: Will pass last argument by untupling");
@@ -732,7 +731,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
732731
pub(super) fn init_fn_tail_call(
733732
&mut self,
734733
fn_val: FnVal<'tcx, M::ExtraFnVal>,
735-
(caller_abi, caller_fn_abi): (Abi, &FnAbi<'tcx, Ty<'tcx>>),
734+
(caller_abi, caller_fn_abi): (ExternAbi, &FnAbi<'tcx, Ty<'tcx>>),
736735
args: &[FnArg<'tcx, M::Provenance>],
737736
with_caller_location: bool,
738737
) -> InterpResult<'tcx> {
@@ -817,7 +816,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
817816

818817
self.init_fn_call(
819818
FnVal::Instance(instance),
820-
(Abi::Rust, fn_abi),
819+
(ExternAbi::Rust, fn_abi),
821820
&[FnArg::Copy(arg.into())],
822821
false,
823822
&ret,

‎compiler/rustc_const_eval/src/interpret/cast.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::assert_matches::assert_matches;
22

3+
use rustc_abi::Integer;
34
use rustc_apfloat::ieee::{Double, Half, Quad, Single};
45
use rustc_apfloat::{Float, FloatConvert};
56
use rustc_middle::mir::CastKind;
@@ -8,7 +9,6 @@ use rustc_middle::ty::adjustment::PointerCoercion;
89
use rustc_middle::ty::layout::{IntegerExt, LayoutOf, TyAndLayout};
910
use rustc_middle::ty::{self, FloatTy, Ty};
1011
use rustc_middle::{bug, span_bug};
11-
use rustc_target::abi::Integer;
1212
use rustc_type_ir::TyKind::*;
1313
use tracing::trace;
1414

‎compiler/rustc_const_eval/src/interpret/discriminant.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! Functions for reading and writing discriminants of multi-variant layouts (enums and coroutines).
22
3+
use rustc_abi::{self as abi, TagEncoding, VariantIdx, Variants};
34
use rustc_middle::ty::layout::{LayoutOf, PrimitiveExt};
45
use rustc_middle::ty::{self, CoroutineArgsExt, ScalarInt, Ty};
56
use rustc_middle::{mir, span_bug};
6-
use rustc_target::abi::{self, TagEncoding, VariantIdx, Variants};
77
use tracing::{instrument, trace};
88

99
use super::{

‎compiler/rustc_const_eval/src/interpret/eval_context.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use either::{Left, Right};
2+
use rustc_abi::{Align, HasDataLayout, Size, TargetDataLayout};
23
use rustc_errors::DiagCtxtHandle;
34
use rustc_hir::def_id::DefId;
45
use rustc_infer::infer::TyCtxtInferExt;
@@ -15,8 +16,7 @@ use rustc_middle::ty::{
1516
use rustc_middle::{mir, span_bug};
1617
use rustc_session::Limit;
1718
use rustc_span::Span;
18-
use rustc_target::abi::call::FnAbi;
19-
use rustc_target::abi::{Align, HasDataLayout, Size, TargetDataLayout};
19+
use rustc_target::callconv::FnAbi;
2020
use rustc_trait_selection::traits::ObligationCtxt;
2121
use tracing::{debug, instrument, trace};
2222

‎compiler/rustc_const_eval/src/interpret/intrinsics.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
55
use std::assert_matches::assert_matches;
66

7+
use rustc_abi::Size;
78
use rustc_apfloat::ieee::{Double, Half, Quad, Single};
89
use rustc_hir::def_id::DefId;
910
use rustc_middle::mir::{self, BinOp, ConstValue, NonDivergingIntrinsic};
1011
use rustc_middle::ty::layout::{LayoutOf as _, TyAndLayout, ValidityRequirement};
1112
use rustc_middle::ty::{GenericArgsRef, Ty, TyCtxt};
1213
use rustc_middle::{bug, ty};
1314
use rustc_span::symbol::{Symbol, sym};
14-
use rustc_target::abi::Size;
1515
use tracing::trace;
1616

1717
use super::memory::MemoryKind;

‎compiler/rustc_const_eval/src/interpret/machine.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use std::borrow::{Borrow, Cow};
66
use std::fmt::Debug;
77
use std::hash::Hash;
88

9+
use rustc_abi::{Align, ExternAbi, Size};
910
use rustc_apfloat::{Float, FloatConvert};
1011
use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};
1112
use rustc_middle::query::TyCtxtAt;
@@ -14,8 +15,6 @@ use rustc_middle::ty::layout::TyAndLayout;
1415
use rustc_middle::{mir, ty};
1516
use rustc_span::Span;
1617
use rustc_span::def_id::DefId;
17-
use rustc_target::abi::{Align, Size};
18-
use rustc_target::spec::abi::Abi as CallAbi;
1918

2019
use super::{
2120
AllocBytes, AllocId, AllocKind, AllocRange, Allocation, CTFE_ALLOC_SALT, ConstAllocation,
@@ -202,7 +201,7 @@ pub trait Machine<'tcx>: Sized {
202201
fn find_mir_or_eval_fn(
203202
ecx: &mut InterpCx<'tcx, Self>,
204203
instance: ty::Instance<'tcx>,
205-
abi: CallAbi,
204+
abi: ExternAbi,
206205
args: &[FnArg<'tcx, Self::Provenance>],
207206
destination: &MPlaceTy<'tcx, Self::Provenance>,
208207
target: Option<mir::BasicBlock>,
@@ -214,7 +213,7 @@ pub trait Machine<'tcx>: Sized {
214213
fn call_extra_fn(
215214
ecx: &mut InterpCx<'tcx, Self>,
216215
fn_val: Self::ExtraFnVal,
217-
abi: CallAbi,
216+
abi: ExternAbi,
218217
args: &[FnArg<'tcx, Self::Provenance>],
219218
destination: &MPlaceTy<'tcx, Self::Provenance>,
220219
target: Option<mir::BasicBlock>,
@@ -653,7 +652,7 @@ pub macro compile_time_machine(<$tcx: lifetime>) {
653652
fn call_extra_fn(
654653
_ecx: &mut InterpCx<$tcx, Self>,
655654
fn_val: !,
656-
_abi: CallAbi,
655+
_abi: ExternAbi,
657656
_args: &[FnArg<$tcx>],
658657
_destination: &MPlaceTy<$tcx, Self::Provenance>,
659658
_target: Option<mir::BasicBlock>,

0 commit comments

Comments
 (0)