Implement Display by mapping Conv to ExternAbi

Author: tiif

compiler/rustc_target/src/callconv/mod.rs

@@ -882,34 +882,35 @@ impl FromStr for Conv {
     }
 }
 
+fn conv_to_externabi(conv: &Conv) -> ExternAbi {
+    match conv {
+        Conv::Rust => ExternAbi::Rust,
+        Conv::PreserveMost => ExternAbi::RustCold,
+        Conv::X86Stdcall => ExternAbi::Stdcall{unwind: false},
+        Conv::X86Fastcall => ExternAbi::Fastcall{unwind: false},
+        Conv::X86VectorCall => ExternAbi::Vectorcall{unwind: false},
+        Conv::X86ThisCall => ExternAbi::Thiscall{unwind: false},
+        Conv::C => ExternAbi::C{unwind: false},
+        Conv::X86_64Win64 => ExternAbi::Win64{unwind: false},
+        Conv::X86_64SysV => ExternAbi::SysV64{unwind: false},
+        Conv::ArmAapcs => ExternAbi::Aapcs{unwind: false},
+        Conv::CCmseNonSecureCall => ExternAbi::CCmseNonSecureCall,
+        Conv::CCmseNonSecureEntry => ExternAbi::CCmseNonSecureEntry,
+        Conv::PtxKernel => ExternAbi::PtxKernel,
+        Conv::Msp430Intr => ExternAbi::Msp430Interrupt,
+        Conv::X86Intr => ExternAbi::X86Interrupt,
+        Conv::GpuKernel => ExternAbi::GpuKernel,
+        Conv::AvrInterrupt => ExternAbi::AvrInterrupt,
+        Conv::AvrNonBlockingInterrupt => ExternAbi::AvrNonBlockingInterrupt,
+        Conv::RiscvInterrupt { kind: RiscvInterruptKind::Machine } => ExternAbi::RiscvInterruptM,
+        Conv::RiscvInterrupt { kind: RiscvInterruptKind::Supervisor } => ExternAbi::RiscvInterruptS,
+        Conv::Cold | Conv::PreserveAll => panic!("This is deadcode"),
+    }
+}
+
 impl Display for Conv {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(match self {
-            Conv::C => "C",
-            Conv::Rust => "Rust",
-            Conv::Cold => "Cold",
-            Conv::PreserveMost => "PreserveMost",
-            Conv::PreserveAll => "PreserveAll",
-            Conv::ArmAapcs => "ArmAapcs",
-            Conv::CCmseNonSecureCall => "CCmseNonSecureCall",
-            Conv::CCmseNonSecureEntry => "CCmseNonSecureEntry",
-            Conv::Msp430Intr => "Msp430Intr",
-            Conv::PtxKernel => "PtxKernel",
-            Conv::GpuKernel => "GpuKernel",
-            Conv::X86Fastcall => "X86Fastcall",
-            Conv::X86Intr => "X86Intr",
-            Conv::X86Stdcall => "X86Stdcall",
-            Conv::X86ThisCall => "X86ThisCall",
-            Conv::X86VectorCall => "X86VectorCall",
-            Conv::X86_64SysV => "X86_64SysV",
-            Conv::X86_64Win64 => "X86_64Win64",
-            Conv::AvrInterrupt => "AvrInterrupt",
-            Conv::AvrNonBlockingInterrupt => "AvrNonBlockingInterrupt",
-            Conv::RiscvInterrupt { kind: RiscvInterruptKind::Machine } => "RiscvInterrupt(machine)",
-            Conv::RiscvInterrupt { kind: RiscvInterruptKind::Supervisor } => {
-                "RiscvInterrupt(supervisor)"
-            }
-        })
+        write!(f, "{}", conv_to_externabi(self))
     }
 }
 

src/tools/miri/tests/fail/function_calls/check_arg_abi.rs

@@ -4,6 +4,6 @@ fn main() {
     }
 
     unsafe {
-        let _ = malloc(0); //~ ERROR: calling a function with ABI C using caller ABI Rust
+        let _ = malloc(0); //~ ERROR: calling a function with calling convention "C" using caller calling convention "Rust"
     };
 }

src/tools/miri/tests/fail/function_calls/check_arg_abi.stderr

@@ -1,8 +1,8 @@
-error: Undefined Behavior: calling a function with ABI C using caller ABI Rust
+error: Undefined Behavior: calling a function with calling convention "C" using caller calling convention "Rust"
   --> tests/fail/function_calls/check_arg_abi.rs:LL:CC
    |
 LL |         let _ = malloc(0);
-   |                 ^^^^^^^^^ calling a function with ABI C using caller ABI Rust
+   |                 ^^^^^^^^^ calling a function with calling convention "C" using caller calling convention "Rust"
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information