Skip to content

Commit ab633af

Browse files
dianqkdianqk
authored
Rollup merge of rust-lang#143190 - dianqk:new-method, r=oli-obk
Use the `new` method for `BasicBlockData` and `Statement` This is the NFC part of rust-lang#142771. I split it to make it easier to review for rust-lang#142771. Even without rust-lang#142771, I think this change is worthwhile.
2 parents 043fc5b + 24e553e commit ab633af

34 files changed

+473
-537
lines changed

‎compiler/rustc_codegen_ssa/src/mir/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,15 +354,15 @@ fn optimize_use_clone<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
354354

355355
let destination_block = target.unwrap();
356356

357-
bb.statements.push(mir::Statement {
358-
source_info: bb.terminator().source_info,
359-
kind: mir::StatementKind::Assign(Box::new((
357+
bb.statements.push(mir::Statement::new(
358+
bb.terminator().source_info,
359+
mir::StatementKind::Assign(Box::new((
360360
*destination,
361361
mir::Rvalue::Use(mir::Operand::Copy(
362362
arg_place.project_deeper(&[mir::ProjectionElem::Deref], tcx),
363363
)),
364364
))),
365-
});
365+
));
366366

367367
bb.terminator_mut().kind = mir::TerminatorKind::Goto { target: destination_block };
368368
}

‎compiler/rustc_middle/src/mir/mod.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1359,7 +1359,15 @@ pub struct BasicBlockData<'tcx> {
13591359

13601360
impl<'tcx> BasicBlockData<'tcx> {
13611361
pub fn new(terminator: Option<Terminator<'tcx>>, is_cleanup: bool) -> BasicBlockData<'tcx> {
1362-
BasicBlockData { statements: vec![], terminator, is_cleanup }
1362+
BasicBlockData::new_stmts(Vec::new(), terminator, is_cleanup)
1363+
}
1364+
1365+
pub fn new_stmts(
1366+
statements: Vec<Statement<'tcx>>,
1367+
terminator: Option<Terminator<'tcx>>,
1368+
is_cleanup: bool,
1369+
) -> BasicBlockData<'tcx> {
1370+
BasicBlockData { statements, terminator, is_cleanup }
13631371
}
13641372

13651373
/// Accessor for terminator.

‎compiler/rustc_middle/src/mir/statement.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@ pub struct Statement<'tcx> {
1616
pub kind: StatementKind<'tcx>,
1717
}
1818

19-
impl Statement<'_> {
19+
impl<'tcx> Statement<'tcx> {
2020
/// Changes a statement to a nop. This is both faster than deleting instructions and avoids
2121
/// invalidating statement indices in `Location`s.
2222
pub fn make_nop(&mut self) {
2323
self.kind = StatementKind::Nop
2424
}
25+
26+
pub fn new(source_info: SourceInfo, kind: StatementKind<'tcx>) -> Self {
27+
Statement { source_info, kind }
28+
}
2529
}
2630

2731
impl<'tcx> StatementKind<'tcx> {

‎compiler/rustc_mir_build/src/builder/cfg.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl<'tcx> CFG<'tcx> {
4242
) {
4343
self.push(
4444
block,
45-
Statement { source_info, kind: StatementKind::Assign(Box::new((place, rvalue))) },
45+
Statement::new(source_info, StatementKind::Assign(Box::new((place, rvalue)))),
4646
);
4747
}
4848

@@ -88,7 +88,7 @@ impl<'tcx> CFG<'tcx> {
8888
place: Place<'tcx>,
8989
) {
9090
let kind = StatementKind::FakeRead(Box::new((cause, place)));
91-
let stmt = Statement { source_info, kind };
91+
let stmt = Statement::new(source_info, kind);
9292
self.push(block, stmt);
9393
}
9494

@@ -99,7 +99,7 @@ impl<'tcx> CFG<'tcx> {
9999
place: Place<'tcx>,
100100
) {
101101
let kind = StatementKind::PlaceMention(Box::new(place));
102-
let stmt = Statement { source_info, kind };
102+
let stmt = Statement::new(source_info, kind);
103103
self.push(block, stmt);
104104
}
105105

@@ -110,7 +110,7 @@ impl<'tcx> CFG<'tcx> {
110110
/// syntax (e.g. `continue` or `if !`) that would otherwise not appear in MIR.
111111
pub(crate) fn push_coverage_span_marker(&mut self, block: BasicBlock, source_info: SourceInfo) {
112112
let kind = StatementKind::Coverage(coverage::CoverageKind::SpanMarker);
113-
let stmt = Statement { source_info, kind };
113+
let stmt = Statement::new(source_info, kind);
114114
self.push(block, stmt);
115115
}
116116

‎compiler/rustc_mir_build/src/builder/coverageinfo.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ impl BlockMarkerGen {
6161
block: BasicBlock,
6262
) -> BlockMarkerId {
6363
let id = self.next_block_marker_id();
64-
let marker_statement = mir::Statement {
64+
let marker_statement = mir::Statement::new(
6565
source_info,
66-
kind: mir::StatementKind::Coverage(CoverageKind::BlockMarker { id }),
67-
};
66+
mir::StatementKind::Coverage(CoverageKind::BlockMarker { id }),
67+
);
6868
cfg.push(block, marker_statement);
6969

7070
id

‎compiler/rustc_mir_build/src/builder/custom/parse.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,8 @@ impl<'a, 'tcx> ParseCtxt<'a, 'tcx> {
315315
let stmt = self.statement_as_expr(*stmt_id)?;
316316
let span = self.thir[stmt].span;
317317
let statement = self.parse_statement(stmt)?;
318-
data.statements.push(Statement {
319-
source_info: SourceInfo { span, scope: self.source_scope },
320-
kind: statement,
321-
});
318+
data.statements
319+
.push(Statement::new(SourceInfo { span, scope: self.source_scope }, statement));
322320
}
323321

324322
let Some(trailing) = block.expr else { return Err(self.expr_error(expr_id, "terminator")) };

‎compiler/rustc_mir_build/src/builder/expr/as_place.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -489,16 +489,16 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
489489
let place = place_builder.to_place(this);
490490
this.cfg.push(
491491
block,
492-
Statement {
493-
source_info: ty_source_info,
494-
kind: StatementKind::AscribeUserType(
492+
Statement::new(
493+
ty_source_info,
494+
StatementKind::AscribeUserType(
495495
Box::new((
496496
place,
497497
UserTypeProjection { base: annotation_index, projs: vec![] },
498498
)),
499499
Variance::Invariant,
500500
),
501-
},
501+
),
502502
);
503503
}
504504
block.and(place_builder)
@@ -518,16 +518,16 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
518518
});
519519
this.cfg.push(
520520
block,
521-
Statement {
522-
source_info: ty_source_info,
523-
kind: StatementKind::AscribeUserType(
521+
Statement::new(
522+
ty_source_info,
523+
StatementKind::AscribeUserType(
524524
Box::new((
525525
Place::from(temp),
526526
UserTypeProjection { base: annotation_index, projs: vec![] },
527527
)),
528528
Variance::Invariant,
529529
),
530-
},
530+
),
531531
);
532532
}
533533
block.and(PlaceBuilder::from(temp))

‎compiler/rustc_mir_build/src/builder/expr/as_rvalue.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
175175
// and therefore is not considered during coroutine auto-trait
176176
// determination. See the comment about `box` at `yield_in_scope`.
177177
let result = this.local_decls.push(LocalDecl::new(expr.ty, expr_span));
178-
this.cfg.push(
179-
block,
180-
Statement { source_info, kind: StatementKind::StorageLive(result) },
181-
);
178+
this.cfg
179+
.push(block, Statement::new(source_info, StatementKind::StorageLive(result)));
182180
if let Some(scope) = scope.temp_lifetime {
183181
// schedule a shallow free of that memory, lest we unwind:
184182
this.schedule_drop_storage_and_value(expr_span, scope, result);
@@ -278,12 +276,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
278276
};
279277
this.cfg.push(
280278
block,
281-
Statement {
279+
Statement::new(
282280
source_info,
283-
kind: StatementKind::Intrinsic(Box::new(
284-
NonDivergingIntrinsic::Assume(Operand::Move(assert_place)),
285-
)),
286-
},
281+
StatementKind::Intrinsic(Box::new(NonDivergingIntrinsic::Assume(
282+
Operand::Move(assert_place),
283+
))),
284+
),
287285
);
288286
}
289287

@@ -789,7 +787,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
789787
let source_info = this.source_info(upvar_span);
790788
let temp = this.local_decls.push(LocalDecl::new(upvar_ty, upvar_span));
791789

792-
this.cfg.push(block, Statement { source_info, kind: StatementKind::StorageLive(temp) });
790+
this.cfg.push(block, Statement::new(source_info, StatementKind::StorageLive(temp)));
793791

794792
let arg_place_builder = unpack!(block = this.as_place_builder(block, arg));
795793

‎compiler/rustc_mir_build/src/builder/expr/as_temp.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
102102
if let Block { expr: None, targeted_by_break: false, .. } = this.thir[block]
103103
&& expr_ty.is_never() => {}
104104
_ => {
105-
this.cfg
106-
.push(block, Statement { source_info, kind: StatementKind::StorageLive(temp) });
105+
this.cfg.push(block, Statement::new(source_info, StatementKind::StorageLive(temp)));
107106

108107
// In constants, `temp_lifetime` is `None` for temporaries that
109108
// live for the `'static` lifetime. Thus we do not drop these

‎compiler/rustc_mir_build/src/builder/matches/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -646,9 +646,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
646646
let base = self.canonical_user_type_annotations.push(annotation.clone());
647647
self.cfg.push(
648648
block,
649-
Statement {
650-
source_info: ty_source_info,
651-
kind: StatementKind::AscribeUserType(
649+
Statement::new(
650+
ty_source_info,
651+
StatementKind::AscribeUserType(
652652
Box::new((place, UserTypeProjection { base, projs: Vec::new() })),
653653
// We always use invariant as the variance here. This is because the
654654
// variance field from the ascription refers to the variance to use
@@ -666,7 +666,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
666666
// `<expr>`.
667667
ty::Invariant,
668668
),
669-
},
669+
),
670670
);
671671

672672
self.schedule_drop_for_binding(var, irrefutable_pat.span, OutsideGuard);
@@ -828,7 +828,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
828828
) -> Place<'tcx> {
829829
let local_id = self.var_local_id(var, for_guard);
830830
let source_info = self.source_info(span);
831-
self.cfg.push(block, Statement { source_info, kind: StatementKind::StorageLive(local_id) });
831+
self.cfg.push(block, Statement::new(source_info, StatementKind::StorageLive(local_id)));
832832
// Although there is almost always scope for given variable in corner cases
833833
// like #92893 we might get variable with no scope.
834834
if let Some(region_scope) = self.region_scope_tree.var_scope(var.0.local_id)
@@ -2578,16 +2578,16 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
25782578
let base = self.canonical_user_type_annotations.push(ascription.annotation);
25792579
self.cfg.push(
25802580
block,
2581-
Statement {
2581+
Statement::new(
25822582
source_info,
2583-
kind: StatementKind::AscribeUserType(
2583+
StatementKind::AscribeUserType(
25842584
Box::new((
25852585
ascription.source,
25862586
UserTypeProjection { base, projs: Vec::new() },
25872587
)),
25882588
ascription.variance,
25892589
),
2590-
},
2590+
),
25912591
);
25922592
}
25932593
}

0 commit comments

Comments
 (0)