feat: add item name and kind fields in SourceCode

But compares test fails:

thread 'test_compare' panicked at tests/compare.rs:33:13:
assertion failed: `(left == right)`: Hash values of "pub fn f()" are not equal: contract1 ≠ contract2

Diff < left / right > :
<151423480243889445466514579282516350541
>117543856677718202152688069605492406669

Author: zjp-CN

src/functions/cache.rs

@@ -75,7 +75,7 @@ impl Cache {
                 let body = inst.body()?;
                 let rustc = self.rustc.as_ref()?;
                 let prefix = self.path_prefixes.prefixes();
-                let src = source_code_with(body.span, rustc.tcx, &rustc.src_map, prefix);
+                let src = source_code_with(inst, body.span, rustc.tcx, &rustc.src_map, prefix);
                 Some(CacheFunction { body, src })
             })
             .as_ref()

src/functions/utils.rs

@@ -3,13 +3,22 @@ use rustc_smir::rustc_internal::internal;
 use rustc_span::{Span, source_map::SourceMap};
 use rustc_stable_hash::{StableHasher, hashers::SipHasher128};
 use serde::Serialize;
+use stable_mir::mir::mono::Instance;
 use std::hash::Hasher;
 
 /// Source code and potential source code before expansion.
 ///
 /// The field order matters, since this struct implements Ord.
 #[derive(Clone, Debug, Serialize, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub struct SourceCode {
+    /// Function name.
+    pub name: String,
+
+    /// String of [`InstanceKind`].
+    ///
+    /// [`InstanceKind`]: https://doc.rust-lang.org/nightly/nightly-rustc/stable_mir/mir/mono/enum.InstanceKind.html
+    pub kind: String,
+
     // A file path where src lies.
     // The path is stripped with pwd or sysroot prefix.
     pub file: String,
@@ -31,6 +40,8 @@ pub struct SourceCode {
 
 impl SourceCode {
     pub fn with_hasher(&self, hasher: &mut StableHasher<SipHasher128>) {
+        hasher.write_str(&self.name);
+        hasher.write_str(&self.kind);
         hasher.write_str(&self.file);
         hasher.write_str(&self.src);
         match &self.before_expansion {
@@ -55,6 +66,7 @@ fn span_to_source(span: Span, src_map: &SourceMap) -> String {
 
 /// Source code for a stable_mir span.
 pub fn source_code_with(
+    inst: &Instance,
     stable_mir_span: stable_mir::ty::Span,
     tcx: TyCtxt,
     src_map: &SourceMap,
@@ -75,5 +87,7 @@ pub fn source_code_with(
         }
     }
 
-    SourceCode { file, src, before_expansion }
+    let name = inst.name();
+    let kind = format!("{:?}", inst.kind);
+    SourceCode { name, kind, file, src, before_expansion }
 }

src/lib.rs

@@ -25,6 +25,14 @@ pub struct Callee {
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct SourceCode {
+    /// Function name.
+    pub name: String,
+
+    /// String of [`InstanceKind`].
+    ///
+    /// [`InstanceKind`]: https://doc.rust-lang.org/nightly/nightly-rustc/stable_mir/mir/mono/enum.InstanceKind.html
+    pub kind: String,
+
     // A file path where src lies.
     // The path is stripped with pwd or sysroot prefix.
     file: String,

tests/compare.rs

@@ -32,7 +32,7 @@ fn compare(tmp: &str, v_file: &[&str], f: &str) {
         for j in 1..len {
             assert_eq!(
                 v_func[i].hash, v_func[j].hash,
-                "Hash values are not equal: {} ≠ {}",
+                "Hash values of {f:?} are not equal: {} ≠ {}",
                 v_file[i], v_file[j]
             );
         }

tests/snapshots/contract1.json

@@ -1,11 +1,13 @@
 [
   {
-    "hash": "876433099390387370318218200145590989814",
+    "hash": "177631543608855386312483865423304532457",
     "def_id": "DefId { id: 0, name: \"verify::f\" }",
     "attrs": [
       "#[kanitool::proof]"
     ],
     "func": {
+      "name": "verify::f",
+      "kind": "Item",
       "file": "tests/compare/proof.rs",
       "src": "pub fn f() {\n        let a = 1;\n        assert_eq!(a + 1, 2);\n    }",
       "before_expansion": null
@@ -15,6 +17,8 @@
       {
         "def_id": "DefId { id: 1, name: \"kani::assert\" }",
         "func": {
+          "name": "kani::assert",
+          "kind": "Item",
           "file": "kani/library/kani_core/src/lib.rs",
           "src": "pub const fn assert(cond: bool, msg: &'static str) {\n            let _ = cond;\n            let _ = msg;\n        }",
           "before_expansion": "kani_core::kani_intrinsics!(std)"

tests/snapshots/contract2.json

@@ -1,11 +1,13 @@
 [
   {
-    "hash": "876433099390387370318218200145590989814",
+    "hash": "177631543608855386312483865423304532457",
     "def_id": "DefId { id: 0, name: \"verify::f\" }",
     "attrs": [
       "#[kanitool::proof]"
     ],
     "func": {
+      "name": "verify::f",
+      "kind": "Item",
       "file": "tests/compare/proof.rs",
       "src": "pub fn f() {\n        let a = 1;\n        assert_eq!(a + 1, 2);\n    }",
       "before_expansion": null
@@ -15,6 +17,8 @@
       {
         "def_id": "DefId { id: 2, name: \"kani::assert\" }",
         "func": {
+          "name": "kani::assert",
+          "kind": "Item",
           "file": "kani/library/kani_core/src/lib.rs",
           "src": "pub const fn assert(cond: bool, msg: &'static str) {\n            let _ = cond;\n            let _ = msg;\n        }",
           "before_expansion": "kani_core::kani_intrinsics!(std)"
@@ -23,12 +27,14 @@
     ]
   },
   {
-    "hash": "47211252920145052832965334366253119118",
+    "hash": "14466344698218474136540205228183942188",
     "def_id": "DefId { id: 1, name: \"verify::g\" }",
     "attrs": [
       "#[kanitool::proof]"
     ],
     "func": {
+      "name": "verify::g",
+      "kind": "Item",
       "file": "tests/compare/proof.rs",
       "src": "pub fn g() {\n        let a = 1;\n        assert_eq!(a + 1, 2);\n    }",
       "before_expansion": null
@@ -38,6 +44,8 @@
       {
         "def_id": "DefId { id: 2, name: \"kani::assert\" }",
         "func": {
+          "name": "kani::assert",
+          "kind": "Item",
           "file": "kani/library/kani_core/src/lib.rs",
           "src": "pub const fn assert(cond: bool, msg: &'static str) {\n            let _ = cond;\n            let _ = msg;\n        }",
           "before_expansion": "kani_core::kani_intrinsics!(std)"

tests/snapshots/proof1.json

@@ -4,7 +4,7 @@ mod verify {
     fn f(a: u8) {}
 
     #[kani::proof]
-    fn recursive_callees() {
+    fn proof() {
         f(0);
     }
 }