Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #116260

Merged
merged 34 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
32c2ed7
Bump ui test crate
oli-obk Jul 31, 2023
c69e0c2
Move `fail` tests that need dependencies into their own folder, so th…
oli-obk Aug 3, 2023
0d5f51c
Bump ui_test crate
oli-obk Aug 4, 2023
e706367
Allow limiting the number of threads running in parallel
oli-obk Aug 4, 2023
9f4e7c6
Bump ui_test crate
oli-obk Aug 8, 2023
5f440dd
GC the Stacked Borrows allocation history
saethlin Sep 24, 2023
598f11a
ref(bootstrap.py): add `eprint` function
pouriya Sep 25, 2023
1ec85a8
Document new env var
oli-obk Sep 25, 2023
71aea48
Explain single element vector
oli-obk Sep 25, 2023
b4dc4f3
Auto merge of #3008 - oli-obk:ui_test_progress_bars, r=RalfJung
bors Sep 25, 2023
ee30aaf
fix normalization in backtrace-api tests
RalfJung Sep 25, 2023
32c0afb
Auto merge of #3083 - saethlin:gc-history, r=oli-obk
bors Sep 25, 2023
e86c68a
Auto merge of #3085 - RalfJung:test-norm, r=RalfJung
bors Sep 25, 2023
fc0d833
Preparing for merge from rustc
Sep 27, 2023
b1f5c66
Merge from rustc
Sep 27, 2023
c8a44b1
clippy
RalfJung Sep 27, 2023
1a3dd7e
Auto merge of #3087 - rust-lang:rustup-2023-09-27, r=RalfJung
bors Sep 27, 2023
3b091cb
Preparing for merge from rustc
Sep 28, 2023
f2623ac
Merge from rustc
Sep 28, 2023
024279a
Auto merge of #3089 - rust-lang:rustup-2023-09-28, r=RalfJung
bors Sep 28, 2023
66bc682
Fix `noop_method_call` detection for new diagnostic items
Jarcho Sep 27, 2023
e0f4ab8
update lockfile
RalfJung Sep 28, 2023
255ca18
Add test for 116212.
cjgillot Sep 28, 2023
3816c15
Only visit reachable nodes in SsaLocals.
cjgillot May 28, 2023
07f81cd
Move needless_raw_string_hashes to pedantic
Alexendoo Aug 27, 2023
f1b7484
Remove `rustc_lint_defs::lint_array`
DaniPopes Sep 28, 2023
b53a1b3
make adt_const_params feature suggestion more consistent with others …
asquared31415 Sep 28, 2023
f777e8c
Rollup merge of #116133 - pouriya:refactor-bootstrap.py, r=albertlars…
matthiaskrgr Sep 29, 2023
e814f1e
Rollup merge of #116201 - Jarcho:noop_fix, r=fee1-dead
matthiaskrgr Sep 29, 2023
0c45018
Rollup merge of #116231 - DaniPopes:simpler-lint-array, r=Nilstrieb
matthiaskrgr Sep 29, 2023
1ed00fe
Rollup merge of #116234 - RalfJung:miri, r=RalfJung
matthiaskrgr Sep 29, 2023
4f09f80
Rollup merge of #116239 - cjgillot:issue-116212, r=WaffleLapkin
matthiaskrgr Sep 29, 2023
92234f9
Rollup merge of #116245 - flip1995:clippy-backport, r=Manishearth
matthiaskrgr Sep 29, 2023
95262e4
Rollup merge of #116253 - asquared31415:adt_const_params_feature, r=c…
matthiaskrgr Sep 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
GC the Stacked Borrows allocation history
  • Loading branch information
saethlin committed Sep 24, 2023
commit 5f440dd0696cf54feb560601c7bc383e49511f1a
7 changes: 7 additions & 0 deletions src/tools/miri/bench-cargo-miri/invalidate/Cargo.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3

[[package]]
name = "invalidate"
version = "0.1.0"
8 changes: 8 additions & 0 deletions src/tools/miri/bench-cargo-miri/invalidate/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "invalidate"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
4 changes: 4 additions & 0 deletions src/tools/miri/bench-cargo-miri/invalidate/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
fn main() {
// The end of the range is just chosen to make the benchmark run for a few seconds.
for _ in 0..200_000 {}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use smallvec::SmallVec;
use std::fmt;

use rustc_data_structures::fx::FxHashSet;
use rustc_middle::mir::interpret::{alloc_range, AllocId, AllocRange, InterpError};
use rustc_span::{Span, SpanData};
use rustc_target::abi::Size;
Expand Down Expand Up @@ -233,6 +234,12 @@ impl AllocHistory {
protectors: SmallVec::new(),
}
}

pub fn retain(&mut self, live_tags: &FxHashSet<BorTag>) {
self.invalidations.retain(|event| live_tags.contains(&event.tag));
self.creations.retain(|event| live_tags.contains(&event.retag.new_tag));
self.protectors.retain(|event| live_tags.contains(&event.tag));
}
}

impl<'history, 'ecx, 'mir, 'tcx> DiagnosticCx<'history, 'ecx, 'mir, 'tcx> {
Expand Down
1 change: 1 addition & 0 deletions src/tools/miri/src/borrow_tracker/stacked_borrows/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ impl Stacks {
stack.retain(live_tags);
}
}
self.history.retain(live_tags);
self.modified_since_last_gc = false;
}
}
Expand Down