compiler: Serialize AbiMap to specs

Author: workingjubilee

Cargo.lock

@@ -3251,6 +3251,7 @@ dependencies = [
  "rustc_macros",
  "rustc_serialize",
  "rustc_span",
+ "serde",
  "serde_json",
  "tracing",
 ]

compiler/rustc_abi/Cargo.toml

@@ -14,7 +14,8 @@ rustc_index = { path = "../rustc_index", default-features = false }
 rustc_macros = { path = "../rustc_macros", optional = true }
 rustc_serialize = { path = "../rustc_serialize", optional = true }
 rustc_span = { path = "../rustc_span", optional = true }
-serde_json = "1"
+serde = { version = "1.0.200", features = ["derive"] }
+serde_json = "1.0.100"
 tracing = "0.1"
 # tidy-alphabetical-end
 

compiler/rustc_abi/src/canon_abi.rs

@@ -99,6 +99,15 @@ impl fmt::Display for CanonAbi {
     }
 }
 
+impl serde::Serialize for CanonAbi {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.to_erased_extern_abi().as_str().serialize(serializer)
+    }
+}
+
 impl CanonAbi {
     /// convert to the ExternAbi that *shares a string* with this CanonAbi
     ///
@@ -187,6 +196,14 @@ impl CanonAbi {
     }
 }
 
+impl TryFrom<ExternAbi> for CanonAbi {
+    type Error = AbiFromStrErr;
+
+    fn try_from(extern_abi: ExternAbi) -> Result<Self, Self::Error> {
+        CanonAbi::try_from_extern_abi(extern_abi)
+    }
+}
+
 impl FromStr for CanonAbi {
     type Err = AbiFromStrErr;
 

compiler/rustc_abi/src/lib.rs

@@ -1913,3 +1913,13 @@ pub enum AbiFromJsonErr {
     UnusedKey,
     Parse { kind: AbiFromStrErr, value: String },
 }
+
+impl fmt::Display for AbiFromStrErr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AbiFromStrErr::Unknown => "no such CanonAbi",
+            AbiFromStrErr::NoUnwind => "unwind is not a CanonAbi",
+        }
+        .fmt(f)
+    }
+}

compiler/rustc_abi/src/map.rs

@@ -4,7 +4,7 @@ use serde_json::Value as JsonValue;
 
 use crate::{AbiFromJsonErr, ArmCall, CanonAbi, ExternAbi, InterruptKind};
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, serde::Serialize)]
 pub struct AbiMap {
     /// a target may support ABIs that are "proper names" for the C ABI, otherwise this is "C"
     pub c_proper: CanonAbi,

compiler/rustc_target/src/spec/json.rs

@@ -767,6 +767,8 @@ impl ToJson for Target {
             }};
         }
 
+        d.insert("abi-map".to_owned(), serde_json::to_value(self.abi_map.clone()).unwrap());
+
         target_val!(llvm_target);
         target_val!(metadata);
         d.insert("target-pointer-width".to_string(), self.pointer_width.to_string().to_json());