Complete check_abi

Author: tiif

Diff for: src/tools/miri/src/helpers.rs

@@ -921,32 +921,18 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
     /// Check that the ABI is what we expect.
     fn check_abi<'a>(&self, fn_abi: &FnAbi<'tcx, Ty<'tcx>>, exp_abi: Conv) -> InterpResult<'a, ()> {
-        let caller_abi_name;
-        let callee_abi_name;
-        match fn_abi.conv {
-            Conv::C => {
-                caller_abi_name = "C";
-            },
-            Conv::Rust => {
-                caller_abi_name = "Rust";
-            },
-            _=> {
-                // TODO: What is a better way of doing this?
-                panic!("Unsupported caller ABI");
-            }
-        };
-        match exp_abi {
-            Conv::C => {
-                callee_abi_name = "C";
-            },
-            Conv::Rust => {
-                callee_abi_name = "Rust";
-            },
-            _=> {
-                // TODO: What is a better way of doing this?
-                panic!("Unsupported callee ABI");
-            }
-        }
+        let caller_abi_name = match fn_abi.conv {
+            Conv::C => "C",
+            Conv::Rust => "Rust",
+            Conv::X86Stdcall => "X86Stdcall",
+            _ => { panic!("Unsupported caller ABI");}
+        }; 
+        let callee_abi_name = match exp_abi {
+            Conv::C => "C",
+            Conv::Rust => "Rust",
+            Conv::X86Stdcall => "X86Stdcall",
+            _ => { panic!("Unsupported callee ABI");}
+        }; 
 
         if fn_abi.conv != exp_abi {
             throw_ub_format!(

Diff for: src/tools/miri/src/shims/tls.rs

@@ -4,7 +4,6 @@ use std::collections::BTreeMap;
 use std::collections::btree_map::Entry as BTreeEntry;
 use std::task::Poll;
 
-
 use rustc_abi::{HasDataLayout, Size, ExternAbi};
 use rustc_middle::ty;
 
@@ -323,7 +322,6 @@ trait EvalContextPrivExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         // but both are ignored by std.
         this.call_function(
             thread_callback,
-            // TODO: is there any equivalent Conv:: that we can use here? 
             ExternAbi::System { unwind: false },
             &[null_ptr.clone(), ImmTy::from_scalar(reason, this.machine.layouts.u32), null_ptr],
             None,