incr.comp.: Make DepNode Copy and valid across compilation sessions
#42537
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks like tidy failed here: |
Mark-Simulacrum
added
the
S-waiting-on-author
michaelwoerister
force-pushed
the
tcx-for-dep-node
branch
from
b24ce4a
to
f4342b0
Compare
michaelwoerister
force-pushed
the
tcx-for-dep-node
branch
from
f4342b0
to
7f48280
Compare
michaelwoerister
added
S-waiting-on-review
|
OK, this should be ready for review. |
michaelwoerister
changed the title
Copy and valid across compilation sessionsCopy and valid across compilation sessions
nikomatsakis
reviewed
Jun 9, 2017
src/librustc/dep_graph/dep_node.rs
Outdated
| @@ -17,6 +17,58 @@ use rustc_data_structures::stable_hasher::{StableHasher, HashStable}; | |||
| use ich::StableHashingContext; | |||
| use std::hash::Hash; | |||
|
|
|||
| //! This module defines the `DepNode` type which the compiler uses to represent | |||
| // erase!() just makes tokens go away. It's used to specify which macro argument | ||
| // is repeated (i.e. which sub-expression of the macro we are in) but don't need | ||
| // to actually use any of the arguments. | ||
| macro_rules! erase { |
|
This is really nice. r=me once errors are resolved. |
michaelwoerister
force-pushed
the
tcx-for-dep-node
branch
from
3fc1e09
to
fdff2d3
Compare
|
@bors r=nikomatsakis |
|
📌 Commit fdff2d3 has been approved by |
bors
added a commit
that referenced
this pull request
Jun 12, 2017
incr.comp.: Make DepNode `Copy` and valid across compilation sessions This PR moves `DepNode` to a representation that does not need retracing and thus simplifies comparing dep-graphs from different compilation sessions. The code also gets a lot simpler in many places, since we don't need the generic parameter on `DepNode` anymore. See #42294 for details. ~~NOTE: Only the last commit of this is new, the rest is already reviewed in #42504 This PR is almost done but there are some things I still want to do: - [x] Add some module-level documentation to `dep_node.rs`, explaining especially what the `define_dep_nodes!()` macro is about. - [x] Do another pass over the dep-graph loading logic. I suspect that we can get rid of building the `edges` map and also use arrays instead of hash maps in some places. cc @rust-lang/compiler r? @nikomatsakis
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Jun 12, 2017
bors
added a commit
that referenced
this pull request
Jun 14, 2017
incr.comp.: Make DepNode's std::fmt::Debug implementation useful again. With #42537 a regular `DepNode` only contains an opaque hash as its identifier. In most cases, this hash is actually a `DefPathHash` and we can reconstruct the `DefId` it came from via a table lookup --- and then use that to print something intelligible for debug outputs. For cases where we cannot reconstruct information from the DepNode's hash, this PR will cache a string representation of the `DepNode` in a side-table. This string is later used for debug outputs. r? @nikomatsakis
bors
added a commit
that referenced
this pull request
Jun 15, 2017
incr.comp.: Make DepNode's std::fmt::Debug implementation useful again. With #42537 a regular `DepNode` only contains an opaque hash as its identifier. In most cases, this hash is actually a `DefPathHash` and we can reconstruct the `DefId` it came from via a table lookup --- and then use that to print something intelligible for debug outputs. For cases where we cannot reconstruct information from the DepNode's hash, this PR will cache a string representation of the `DepNode` in a side-table. This string is later used for debug outputs. r? @nikomatsakis
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR moves
DepNodeto a representation that does not need retracing and thus simplifies comparing dep-graphs from different compilation sessions. The code also gets a lot simpler in many places, since we don't need the generic parameter onDepNodeanymore. See #42294 for details.NOTE: Only the last commit of this is new, the rest is already reviewed in #42504.This PR is almost done but there are some things I still want to do:
dep_node.rs, explaining especially what thedefine_dep_nodes!()macro is about.edgesmap and also use arrays instead of hash maps in some places.cc @rust-lang/compiler
r? @nikomatsakis