Fix the remaining error

Author: tiif

src/tools/miri/src/bin/miri.rs

@@ -29,6 +29,7 @@ use std::path::PathBuf;
 use std::str::FromStr;
 
 use miri::{BacktraceStyle, BorrowTrackerMethod, ProvenanceMode, RetagFields, ValidationMode};
+use rustc_abi::ExternAbi;
 use rustc_data_structures::sync::Lrc;
 use rustc_driver::Compilation;
 use rustc_hir::def_id::LOCAL_CRATE;
@@ -367,7 +368,7 @@ fn entry_fn(tcx: TyCtxt<'_>) -> (DefId, EntryFnType) {
             tcx.types.isize,
             false,
             hir::Safety::Safe,
-            Conv::Rust,
+            ExternAbi::Rust,
         ));
 
         let correct_func_sig = check_function_signature(

src/tools/miri/src/concurrency/thread.rs

@@ -15,6 +15,7 @@ use rustc_middle::mir::Mutability;
 use rustc_middle::ty::layout::TyAndLayout;
 use rustc_span::Span;
 
+
 use crate::concurrency::data_race;
 use crate::shims::tls;
 use crate::*;

src/tools/miri/src/eval.rs

@@ -13,6 +13,7 @@ use rustc_hir::def_id::DefId;
 use rustc_middle::ty::layout::{LayoutCx, LayoutOf};
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_session::config::EntryFnType;
+use rustc_abi::ExternAbi;
 
 use crate::concurrency::thread::TlsAllocAction;
 use crate::diagnostics::report_leaks;
@@ -391,7 +392,7 @@ pub fn create_ecx<'tcx>(
 
             ecx.call_function(
                 start_instance,
-                Conv::Rust,
+                ExternAbi::Rust,
                 &[
                     ImmTy::from_scalar(
                         Scalar::from_pointer(main_ptr, &ecx),
@@ -409,7 +410,7 @@ pub fn create_ecx<'tcx>(
         EntryFnType::Start => {
             ecx.call_function(
                 entry_instance,
-                Conv::Rust,
+                ExternAbi::Rust,
                 &[argc, argv],
                 Some(&ret_place),
                 StackPopCleanup::Root { cleanup: true },

src/tools/miri/src/machine.rs

@@ -23,6 +23,7 @@ use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
 use rustc_session::config::InliningThreshold;
 use rustc_span::def_id::{CrateNum, DefId};
 use rustc_span::{Span, SpanData, Symbol};
+use rustc_abi::ExternAbi;
 
 
 use crate::concurrency::cpu_affinity::{self, CpuAffinityMask};
@@ -1076,7 +1077,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
         // Call the lang item.
         let panic = ecx.tcx.lang_items().get(reason.lang_item()).unwrap();
         let panic = ty::Instance::mono(ecx.tcx.tcx, panic);
-        ecx.call_function(panic, Conv::Rust, &[], None, StackPopCleanup::Goto {
+        ecx.call_function(panic, ExternAbi::Rust, &[], None, StackPopCleanup::Goto {
             ret: None,
             unwind: mir::UnwindAction::Unreachable,
         })?;

src/tools/miri/src/shims/foreign_items.rs

@@ -13,6 +13,7 @@ use rustc_middle::{mir, ty};
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
+use rustc_target::callconv::Conv;
 
 use self::helpers::{ToHost, ToSoft};
 use super::alloc::EvalContextExt as _;
@@ -963,7 +964,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
             }
             // FIXME: Move these to an `arm` submodule.
             "llvm.aarch64.isb" if this.tcx.sess.target.arch == "aarch64" => {
-                let [arg] = this.check_shim(abi, Conv::Unadjusted, link_name, args)?;
+                let [arg] = this.check_shim(abi, Conv::C, link_name, args)?;
                 let arg = this.read_scalar(arg)?.to_i32()?;
                 match arg {
                     // SY ("full system scope")
@@ -976,7 +977,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 }
             }
             "llvm.arm.hint" if this.tcx.sess.target.arch == "arm" => {
-                let [arg] = this.check_shim(abi, Conv::Unadjusted, link_name, args)?;
+                let [arg] = this.check_shim(abi, Conv::C, link_name, args)?;
                 let arg = this.read_scalar(arg)?.to_i32()?;
                 // Note that different arguments might have different target feature requirements.
                 match arg {

src/tools/miri/src/shims/panic.rs

@@ -14,6 +14,8 @@
 use rustc_ast::Mutability;
 use rustc_middle::{mir, ty};
 use rustc_target::spec::PanicStrategy;
+use rustc_abi::ExternAbi;
+
 
 use self::helpers::check_arg_count;
 use crate::*;
@@ -87,7 +89,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         trace!("try_fn: {:?}", f_instance);
         this.call_function(
             f_instance,
-            Conv::Rust,
+            ExternAbi::Rust,
             &[data.clone()],
             None,
             // Directly return to caller.
@@ -138,7 +140,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             trace!("catch_fn: {:?}", f_instance);
             this.call_function(
                 f_instance,
-                Conv::Rust,
+                ExternAbi::Rust,
                 &[catch_unwind.data, payload],
                 None,
                 // Directly return to caller of `try`.
@@ -167,7 +169,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         let panic = ty::Instance::mono(this.tcx.tcx, panic);
         this.call_function(
             panic,
-            Conv::Rust,
+            ExternAbi::Rust,
             &[this.mplace_to_ref(&msg)?],
             None,
             StackPopCleanup::Goto { ret: None, unwind },
@@ -186,7 +188,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         let panic = ty::Instance::mono(this.tcx.tcx, panic);
         this.call_function(
             panic,
-            Conv::Rust,
+            ExternAbi::Rust,
             &[this.mplace_to_ref(&msg)?],
             None,
             StackPopCleanup::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },
@@ -215,7 +217,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let panic_bounds_check = ty::Instance::mono(this.tcx.tcx, panic_bounds_check);
                 this.call_function(
                     panic_bounds_check,
-                    Conv::Rust,
+                    ExternAbi::Rust,
                     &[index, len],
                     None,
                     StackPopCleanup::Goto { ret: None, unwind },
@@ -236,7 +238,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     ty::Instance::mono(this.tcx.tcx, panic_misaligned_pointer_dereference);
                 this.call_function(
                     panic_misaligned_pointer_dereference,
-                    Conv::Rust,
+                    ExternAbi::Rust,
                     &[required, found],
                     None,
                     StackPopCleanup::Goto { ret: None, unwind },
@@ -247,7 +249,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 // Call the lang item associated with this message.
                 let fn_item = this.tcx.require_lang_item(msg.panic_function(), None);
                 let instance = ty::Instance::mono(this.tcx.tcx, fn_item);
-                this.call_function(instance, Conv::Rust, &[], None, StackPopCleanup::Goto {
+                this.call_function(instance, ExternAbi::Rust, &[], None, StackPopCleanup::Goto {
                     ret: None,
                     unwind,
                 })?;

src/tools/miri/src/shims/tls.rs

@@ -4,7 +4,8 @@ use std::collections::BTreeMap;
 use std::collections::btree_map::Entry as BTreeEntry;
 use std::task::Poll;
 
-use rustc_abi::{HasDataLayout, Size};
+
+use rustc_abi::{HasDataLayout, Size, ExternAbi};
 use rustc_middle::ty;
 
 use crate::*;
@@ -344,7 +345,7 @@ trait EvalContextPrivExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
             this.call_function(
                 instance,
-                Conv::C,
+                ExternAbi::C { unwind: false },
                 &[ImmTy::from_scalar(data, this.machine.layouts.mut_raw_ptr)],
                 None,
                 StackPopCleanup::Root { cleanup: true },
@@ -381,7 +382,7 @@ trait EvalContextPrivExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
             this.call_function(
                 instance,
-                Conv::C,
+                ExternAbi::C { unwind: false },
                 &[ImmTy::from_scalar(ptr, this.machine.layouts.mut_raw_ptr)],
                 None,
                 StackPopCleanup::Root { cleanup: true },

src/tools/miri/src/shims/unix/android/foreign_items.rs

@@ -2,6 +2,7 @@
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
+use rustc_target::callconv::Conv;
 
 use crate::shims::unix::android::thread::prctl;
 use crate::shims::unix::linux::syscall::syscall;

src/tools/miri/src/shims/unix/android/thread.rs

@@ -2,6 +2,7 @@ use rustc_abi::Size;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
+use rustc_target::callconv::Conv;
 
 use crate::helpers::check_min_arg_count;
 use crate::shims::unix::thread::{EvalContextExt as _, ThreadNameResult};

src/tools/miri/src/shims/unix/freebsd/foreign_items.rs

@@ -2,6 +2,7 @@
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
+use rustc_target::callconv::Conv;
 
 use crate::shims::unix::*;
 use crate::*;

src/tools/miri/src/shims/unix/linux/foreign_items.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;

src/tools/miri/src/shims/unix/linux/syscall.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;

src/tools/miri/src/shims/unix/macos/foreign_items.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;

src/tools/miri/src/shims/unix/solarish/foreign_items.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;

src/tools/miri/src/shims/unix/thread.rs

@@ -1,6 +1,7 @@
 
 
 use crate::*;
+use rustc_abi::ExternAbi;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ThreadNameResult {
@@ -29,7 +30,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         this.start_regular_thread(
             Some(thread_info_place),
             start_routine,
-            Conv::C,
+            ExternAbi::C { unwind: false },
             func_arg,
             this.machine.layouts.mut_raw_ptr,
         )?;

src/tools/miri/src/shims/wasi/foreign_items.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;

src/tools/miri/src/shims/windows/foreign_items.rs

@@ -6,6 +6,7 @@ use rustc_abi::{Align, Size};
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
+use rustc_target::callconv::Conv;
 
 use self::shims::windows::handle::{Handle, PseudoHandle};
 use crate::shims::os_str::bytes_to_os_str;

src/tools/miri/src/shims/x86/aesni.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_middle::ty::Ty;
 use rustc_middle::ty::layout::LayoutOf as _;
 use rustc_span::Symbol;

src/tools/miri/src/shims/x86/avx.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_apfloat::ieee::{Double, Single};
 use rustc_middle::mir;
 use rustc_middle::ty::Ty;

src/tools/miri/src/shims/x86/avx2.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_middle::mir;
 use rustc_middle::ty::Ty;
 use rustc_middle::ty::layout::LayoutOf as _;

src/tools/miri/src/shims/x86/bmi.rs

@@ -2,6 +2,7 @@
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
+use rustc_target::callconv::Conv;
 
 use crate::*;
 

src/tools/miri/src/shims/x86/gfni.rs

@@ -2,6 +2,7 @@
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
+use rustc_target::callconv::Conv;
 
 use crate::*;
 

src/tools/miri/src/shims/x86/mod.rs

@@ -1,12 +1,13 @@
 use rand::Rng as _;
-use rustc_abi::{ExternAbi, Size};
+use rustc_abi::Size;
 use rustc_apfloat::Float;
 use rustc_apfloat::ieee::Single;
 use rustc_middle::ty::Ty;
 use rustc_middle::ty::layout::LayoutOf as _;
 use rustc_middle::{mir, ty};
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
+use rustc_target::callconv::Conv;
 
 use self::helpers::bool_to_simd_element;
 use crate::*;
@@ -47,7 +48,7 @@ pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     return interp_ok(EmulateItemResult::NotSupported);
                 }
 
-                let [cb_in, a, b] = this.check_shim(abi, ExternAbi::Unadjusted, link_name, args)?;
+                let [cb_in, a, b] = this.check_shim(abi, Conv::C, link_name, args)?;
 
                 let op = if unprefixed_name.starts_with("add") {
                     mir::BinOp::AddWithOverflow
@@ -70,9 +71,8 @@ pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 if is_u64 && this.tcx.sess.target.arch != "x86_64" {
                     return interp_ok(EmulateItemResult::NotSupported);
                 }
-                // TODO: How do we handle ExternAbi::Unadjusted??
                 let [c_in, a, b, out] =
-                    this.check_shim(abi, ExternAbi::Unadjusted, link_name, args)?;
+                    this.check_shim(abi, Conv::C, link_name, args)?;
                 let out = this.deref_pointer_as(
                     out,
                     if is_u64 { this.machine.layouts.u64 } else { this.machine.layouts.u32 },

src/tools/miri/src/shims/x86/sha.rs

@@ -4,7 +4,7 @@
 //!
 //! [RustCrypto's sha256 module]: https://github.com/RustCrypto/hashes/blob/6be8466247e936c415d8aafb848697f39894a386/sha2/src/sha256/soft.rs
 
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;

src/tools/miri/src/shims/x86/sse.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_apfloat::ieee::Single;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;

src/tools/miri/src/shims/x86/sse2.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_apfloat::ieee::Double;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;

src/tools/miri/src/shims/x86/sse3.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_middle::mir;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;

src/tools/miri/src/shims/x86/sse41.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;

src/tools/miri/src/shims/x86/sse42.rs

@@ -1,9 +1,10 @@
-use rustc_abi::{ExternAbi, Size};
+use rustc_abi::Size;
 use rustc_middle::mir;
 use rustc_middle::ty::Ty;
 use rustc_middle::ty::layout::LayoutOf as _;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;
+use rustc_target::callconv::Conv;
 
 use crate::*;
 

src/tools/miri/src/shims/x86/ssse3.rs

@@ -1,4 +1,4 @@
-use rustc_abi::ExternAbi;
+use rustc_target::callconv::Conv;
 use rustc_middle::mir;
 use rustc_span::Symbol;
 use rustc_target::callconv::FnAbi;