Skip to content

Use InternedString instead of Symbol for type parameter types (2) #49695

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 4 commits into from
Apr 11, 2018
Merged

Use InternedString instead of Symbol for type parameter types (2) #49695

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abfc8c2
Use InternedString instead of Symbol for type parameters.
michaelwoerister Mar 21, 2018
e31dae4
Improve assertion in Query::force().
michaelwoerister Mar 22, 2018
7466740
Fix error in rustc_driver::test.
michaelwoerister Apr 4, 2018
4c4f9b9
Fix rustdoc after changing type param representation.
michaelwoerister Apr 3, 2018
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
Improve assertion in Query::force().
  • Loading branch information
@michaelwoerister
michaelwoerister committed Apr 6, 2018
commit e31dae4741bc1eaaceeef0fd96dd0135d36598e0
11 changes: 10 additions & 1 deletion src/librustc/ty/maps/plumbing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,16 @@ macro_rules! define_maps {
map: LockGuard<'_, QueryMap<$tcx, Self>>,
dep_node: DepNode)
-> Result<($V, DepNodeIndex), CycleError<$tcx>> {
debug_assert!(!tcx.dep_graph.dep_node_exists(&dep_node));
// If the following assertion triggers, it can have two reasons:
// 1. Something is wrong with DepNode creation, either here or
// in DepGraph::try_mark_green()
// 2. Two distinct query keys get mapped to the same DepNode
// (see for example #48923)
assert!(!tcx.dep_graph.dep_node_exists(&dep_node),
"Forcing query with already existing DepNode.\n\
- query-key: {:?}\n\
- dep-node: {:?}",
key, dep_node);

profq_msg!(tcx, ProfileQueriesMsg::ProviderBegin);
let res = Self::start_job(tcx,
Expand Down