Auto merge of #155628 - nnethercote:CStore-from_tcx, r=<try>

bors · bors · commit 58e1a01ba68d · 2026-04-22T02:22:17.000Z
Streamline `CrateMetadataRef` construction in `provide_one!`.
diff --git a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
@@ -152,13 +152,8 @@ macro_rules! provide_one {
                 $tcx.ensure_ok().crate_hash($def_id.krate);
             }
 
-            let cdata = rustc_data_structures::sync::FreezeReadGuard::map(CStore::from_tcx($tcx), |c| {
-                c.get_crate_data($def_id.krate).cdata
-            });
-            let $cdata = crate::creader::CrateMetadataRef {
-                cdata: &cdata,
-                cstore: &CStore::from_tcx($tcx),
-            };
+            let cstore = CStore::from_tcx($tcx);
+            let $cdata = cstore.get_crate_data($def_id.krate);
 
             $compute
         }

Original file line number	Diff line number	Diff line change
`@@ -152,13 +152,8 @@ macro_rules! provide_one {`
`152`	`152`	`$tcx.ensure_ok().crate_hash($def_id.krate);`
`153`	`153`	`}`
`154`	`154`
`155`		`- let cdata = rustc_data_structures::sync::FreezeReadGuard::map(CStore::from_tcx($tcx), \|c\| {`
`156`		`- c.get_crate_data($def_id.krate).cdata`
`157`		`- });`
`158`		`- let $cdata = crate::creader::CrateMetadataRef {`
`159`		`- cdata: &cdata,`
`160`		`- cstore: &CStore::from_tcx($tcx),`
`161`		`- };`
	`155`	`+ let cstore = CStore::from_tcx($tcx);`
	`156`	`+ let $cdata = cstore.get_crate_data($def_id.krate);`
`162`	`157`
`163`	`158`	`$compute`
`164`	`159`	`}`