diff options
| author | bors <bors@rust-lang.org> | 2022-04-06 21:15:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-06 21:15:16 +0000 |
| commit | 8f36334ca939a67cce3f37f24953ff6f2d3f3d33 (patch) | |
| tree | a3c11a30dc96000927385cae40f36a194b09ed41 /src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff | |
| parent | c2afaba465e0bf44b9b37beba8d908b78dcdadc7 (diff) | |
| parent | ebba894f197ac06bfca84d61e11234484ce74773 (diff) | |
| download | rust-8f36334ca939a67cce3f37f24953ff6f2d3f3d33.tar.gz rust-8f36334ca939a67cce3f37f24953ff6f2d3f3d33.zip | |
Auto merge of #95742 - Dylan-DPC:rollup-8n7o87y, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #95342 (Ignore "format the world" commit in git blame) - #95353 ([bootstrap] Give a hard error when filtering tests for a file that does not exist) - #95649 (New mir-opt deref_separator) - #95721 (Fix typo in bootstrap/setup.rs) - #95730 (Rename RWLock to RwLock in std::sys.) - #95731 (Check that all hidden types are the same and then deduplicate them.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff')
| -rw-r--r-- | src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff b/src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff index 892fdda818e..b41582477c6 100644 --- a/src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff +++ b/src/test/mir-opt/lower_array_len.array_len.NormalizeArrayLen.diff @@ -26,5 +26,9 @@ StorageDead(_2); // scope 0 at $DIR/lower_array_len.rs:31:13: 31:14 return; // scope 0 at $DIR/lower_array_len.rs:32:2: 32:2 } + + bb2 (cleanup): { + resume; // scope 0 at $DIR/lower_array_len.rs:30:1: 32:2 + } } |