Make tcx.stable_crate_id() faster

bjorn3 · bjorn3 · commit ca935ddbf104 · 2021-07-06T11:28:06.000+02:00
diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs
@@ -1299,8 +1299,12 @@ impl<'tcx> TyCtxt<'tcx> {
     }
 
     #[inline]
-    pub fn stable_crate_id(self, cnum: CrateNum) -> StableCrateId {
-        self.def_path_hash(cnum.as_def_id()).stable_crate_id()
+    pub fn stable_crate_id(self, crate_num: CrateNum) -> StableCrateId {
+        if crate_num == LOCAL_CRATE {
+            self.sess.local_stable_crate_id()
+        } else {
+            self.cstore.stable_crate_id_untracked(crate_num)
+        }
     }
 
     pub fn def_path_debug_str(self, def_id: DefId) -> String {

Original file line number	Diff line number	Diff line change
`@@ -1299,8 +1299,12 @@ impl<'tcx> TyCtxt<'tcx> {`
`1299`	`1299`	`}`
`1300`	`1300`
`1301`	`1301`	`#[inline]`
`1302`		`- pub fn stable_crate_id(self, cnum: CrateNum) -> StableCrateId {`
`1303`		`- self.def_path_hash(cnum.as_def_id()).stable_crate_id()`
	`1302`	`+ pub fn stable_crate_id(self, crate_num: CrateNum) -> StableCrateId {`
	`1303`	`+ if crate_num == LOCAL_CRATE {`
	`1304`	`+ self.sess.local_stable_crate_id()`
	`1305`	`+ } else {`
	`1306`	`+ self.cstore.stable_crate_id_untracked(crate_num)`
	`1307`	`+ }`
`1304`	`1308`	`}`
`1305`	`1309`
`1306`	`1310`	`pub fn def_path_debug_str(self, def_id: DefId) -> String {`