bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Encode constant determinism in disambiguator.

Browse source
This commit is contained in:
Camille GILLOT 2024-06-26 13:27:38 +00:00
parent 9d23c86176
commit 61ef0441b8
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_mir_transform/src/gvn.rs
View file

@ -204,6 +204,7 @@ enum Value<'tcx> {
value: Const<'tcx>, value: Const<'tcx>,
/// Some constants do not have a deterministic value. To avoid merging two instances of the /// Some constants do not have a deterministic value. To avoid merging two instances of the
/// same `Const`, we assign them an additional integer index. /// same `Const`, we assign them an additional integer index.
// `disambiguator` is 0 iff the constant is deterministic.
disambiguator: usize, disambiguator: usize,
}, },
/// An aggregate value, either tuple/closure/struct/enum. /// An aggregate value, either tuple/closure/struct/enum.
@ -288,7 +289,7 @@ impl<'body, 'tcx> VnState<'body, 'tcx> {
rev_locals: IndexVec::with_capacity(num_values), rev_locals: IndexVec::with_capacity(num_values),
values: FxIndexSet::with_capacity_and_hasher(num_values, Default::default()), values: FxIndexSet::with_capacity_and_hasher(num_values, Default::default()),
evaluated: IndexVec::with_capacity(num_values), evaluated: IndexVec::with_capacity(num_values),
next_opaque: Some(0), next_opaque: Some(1),
feature_unsized_locals: tcx.features().unsized_locals, feature_unsized_locals: tcx.features().unsized_locals,
ssa, ssa,
dominators, dominators,
@ -360,6 +361,7 @@ impl<'body, 'tcx> VnState<'body, 'tcx> {
let next_opaque = self.next_opaque.as_mut()?; let next_opaque = self.next_opaque.as_mut()?;
let disambiguator = *next_opaque; let disambiguator = *next_opaque;
*next_opaque += 1; *next_opaque += 1;
assert_ne!(disambiguator, 0);
disambiguator disambiguator
}; };
Some(self.insert(Value::Constant { value, disambiguator })) Some(self.insert(Value::Constant { value, disambiguator }))
@ -1447,12 +1449,11 @@ impl<'tcx> VnState<'_, 'tcx> {
/// If `index` is a `Value::Constant`, return the `Constant` to be put in the MIR. /// If `index` is a `Value::Constant`, return the `Constant` to be put in the MIR.
fn try_as_constant(&mut self, index: VnIndex) -> Option<ConstOperand<'tcx>> { fn try_as_constant(&mut self, index: VnIndex) -> Option<ConstOperand<'tcx>> {
// This was already constant in MIR, do not change it. // This was already constant in MIR, do not change it. If the constant is not
if let Value::Constant { value, disambiguator: _ } = *self.get(index) // deterministic, adding an additional mention of it in MIR will not give the same value as
// If the constant is not deterministic, adding an additional mention of it in MIR will // the former mention.
// not give the same value as the former mention. if let Value::Constant { value, disambiguator: 0 } = *self.get(index) {
&& value.is_deterministic() assert!(value.is_deterministic());
{
return Some(ConstOperand { span: DUMMY_SP, user_ty: None, const_: value }); return Some(ConstOperand { span: DUMMY_SP, user_ty: None, const_: value });
} }