cache propagated const

tesuji · tesuji · commit 8c2497b49742 · 2024-06-13T21:56:44.000Z
diff --git a/compiler/rustc_mir_transform/src/gvn.rs b/compiler/rustc_mir_transform/src/gvn.rs
@@ -1373,6 +1373,10 @@ impl<'tcx> VnState<'_, 'tcx> {
         assert!(!value.may_have_provenance(self.tcx, op.layout.size));
 
         let const_ = Const::Val(value, op.layout.ty);
+        // cache the propagated const
+        if let Some(new_index) = self.insert_constant(const_) {
+            self.values.swap_indices(index.as_usize(), new_index.as_usize());
+        }
         Some(ConstOperand { span: DUMMY_SP, user_ty: None, const_ })
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1373,6 +1373,10 @@ impl<'tcx> VnState<'_, 'tcx> {`
`1373`	`1373`	`assert!(!value.may_have_provenance(self.tcx, op.layout.size));`
`1374`	`1374`
`1375`	`1375`	`let const_ = Const::Val(value, op.layout.ty);`
	`1376`	`+ // cache the propagated const`
	`1377`	`+ if let Some(new_index) = self.insert_constant(const_) {`
	`1378`	`+ self.values.swap_indices(index.as_usize(), new_index.as_usize());`
	`1379`	`+ }`
`1376`	`1380`	`Some(ConstOperand { span: DUMMY_SP, user_ty: None, const_ })`
`1377`	`1381`	`}`
`1378`	`1382`