8000 create a "provisional cache" to restore performance in the case of cycles by nikomatsakis · Pull Request #61754 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

create a "provisional cache" to restore performance in the case of cycles #61754

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Jun 16, 2019
Merged

create a "provisional cache" to restore performance in the case of cycles #61754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
db1dfb2
rename `evaluate_obligation_recursively`
nikomatsakis Jun 4, 2019
e64a7bf
introduce a stack depth
nikomatsakis Jun 6, 2019
5486a86
propagate depth that was reached, not just whether there was a cycle
nikomatsakis Jun 10, 2019
35f5ef6
execute cycle check before we consider caching
nikomatsakis Jun 10, 2019
c86f948
introduce ProvisionalEvaluationCache
nikomatsakis Jun 10, 2019
a1a8a7b
add in a depth-first number for stack entries
nikomatsakis Jun 10, 2019
9639d8e
add the "provisional cache"
nikomatsakis Jun 11, 2019
6fdcc82
remove hacks that are no longer needed
nikomatsakis Jun 11, 2019
59f5045
add more debug logs
nikomatsakis Jun 12, 2019
cb8158d
correctly set the `reached_depth` field
nikomatsakis Jun 12, 2019
bb97fe0
revert change incorrectly identified as "hack"
pnkfelix Jun 13, 2019
0baa925
put back the workarounds for #60846
pnkfelix Jun 14, 2019
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
remove hacks that are no longer needed
  • Loading branch information
@nikomatsakis
nikomatsakis committed Jun 12, 2019
commit 6fdcc8281a93c3aa032df245ca5d0342adcb01b1
11 changes: 0 additions & 11 deletions src/libsyntax/tokenstream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,6 @@ where
TokenStream: Send + Sync,
{}

// These are safe since we ensure that they hold for all fields in the `_dummy` function.
//
// These impls are only here because the compiler takes forever to compute the Send and Sync
// bounds without them.
// FIXME: Remove these impls when the compiler can compute the bounds quickly again.
// See https://github.com/rust-lang/rust/issues/60846
#[cfg(parallel_compiler)]
unsafe impl Send for TokenTree {}
#[cfg(parallel_compiler)]
unsafe impl Sync for TokenTree {}

impl TokenTree {
/// Use this token tree as a matcher to parse given tts.
pub fn parse(cx: &base::ExtCtxt<'_>, mtch: &[quoted::TokenTree], tts: TokenStream)
Expand Down
8 changes: 0 additions & 8 deletions src/libsyntax_pos/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,14 +227,6 @@ impl SpanData {
}
}

// The interner is pointed to by a thread local value which is only set on the main thread
// with parallelization is disabled. So we don't allow `Span` to transfer between threads
// to avoid panics and other errors, even though it would be memory safe to do so.
#[cfg(not(parallel_compiler))]
impl !Send for Span {}
#[cfg(not(parallel_compiler))]
impl !Sync for Span {}

impl PartialOrd for Span {
fn partial_cmp(&self, rhs: &Self) -> Option<Ordering> {
PartialOrd::partial_cmp(&self.data(), &rhs.data())
Expand Down
0