diff options
| author | bors <bors@rust-lang.org> | 2023-08-01 16:09:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-01 16:09:13 +0000 |
| commit | 4896daa3985010e7d136fe0c5bf4c4e8bfc911ae (patch) | |
| tree | 4daf7dcc56c274b7786e104e1ecd0504b3152a6e /compiler/rustc_mir_transform/src/coverage/mod.rs | |
| parent | 828bdc2c26f5c95773c4ecf72870919f16417b66 (diff) | |
| parent | 41364c7c1d7142532b747100177c8b889475dde3 (diff) | |
| download | rust-4896daa3985010e7d136fe0c5bf4c4e8bfc911ae.tar.gz rust-4896daa3985010e7d136fe0c5bf4c4e8bfc911ae.zip | |
Auto merge of #114331 - matthiaskrgr:rollup-rnrmwcx, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #100455 (Implement RefUnwindSafe for Backtrace) - #113428 (coverage: Replace `ExpressionOperandId` with enum `Operand`) - #114283 (Use parking lot's rwlock even without parallel-rustc) - #114288 (Improve diagnostic for wrong borrow on binary operations) - #114296 (interpret: fix alignment handling for Repeat expressions) - #114306 ([rustc_data_structures][perf] Simplify base_n::push_str.) - #114320 (Cover statements for stable_mir) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/mod.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/mod.rs b/compiler/rustc_mir_transform/src/coverage/mod.rs index 076e714d703..f713613d313 100644 --- a/compiler/rustc_mir_transform/src/coverage/mod.rs +++ b/compiler/rustc_mir_transform/src/coverage/mod.rs @@ -304,7 +304,7 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> { let counter_kind = if let Some(&counter_operand) = bcb_counters[bcb].as_ref() { self.coverage_counters.make_identity_counter(counter_operand) } else if let Some(counter_kind) = self.bcb_data_mut(bcb).take_counter() { - bcb_counters[bcb] = Some(counter_kind.as_operand_id()); + bcb_counters[bcb] = Some(counter_kind.as_operand()); debug_used_expressions.add_expression_operands(&counter_kind); counter_kind } else { |