bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #96050 - oli-obk:deaggregator_cleanup, r=RalfJung

Browse source 
Remove some now-dead code that was only relevant before deaggregation.

The code was broken anyway, if the deaggregator is disabled, it would have ICEd on any non-enum Adt

r? ```@RalfJung```
This commit is contained in:
Dylan DPC 2022-04-16 07:12:47 +02:00 • committed by GitHub
commit ab7fb29878
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_const_eval/src/interpret/step.rs
View file

@ -196,27 +196,11 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
self.write_immediate(*val, &dest)?; self.write_immediate(*val, &dest)?;
} }
Aggregate(ref kind, ref operands) => { Aggregate(box ref kind, ref operands) => {
// active_field_index is for union initialization. assert!(matches!(kind, mir::AggregateKind::Array(..)));
let (dest, active_field_index) = match **kind {
mir::AggregateKind::Adt(adt_did, variant_index, _, _, active_field_index) => {
self.write_discriminant(variant_index, &dest)?;
if self.tcx.adt_def(adt_did).is_enum() {
assert!(active_field_index.is_none());
(self.place_downcast(&dest, variant_index)?, None)
} else {
if active_field_index.is_some() {
assert_eq!(operands.len(), 1);
}
(dest, active_field_index)
}
}
_ => (dest, None),
};
for (i, operand) in operands.iter().enumerate() { for (field_index, operand) in operands.iter().enumerate() {
let op = self.eval_operand(operand, None)?; let op = self.eval_operand(operand, None)?;
let field_index = active_field_index.unwrap_or(i);
let field_dest = self.place_field(&dest, field_index)?; let field_dest = self.place_field(&dest, field_index)?;
self.copy_op(&op, &field_dest)?; self.copy_op(&op, &field_dest)?;
} }