Skip to content

Remove unused dominator iterator #116612

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 1 commit into from
Oct 11, 2023
Merged

Remove unused dominator iterator #116612

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 1 addition & 26 deletions compiler/rustc_data_structures/src/graph/dominators/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ struct Inner<N: Idx> {
post_order_rank: IndexVec<N, usize>,
// Even though we track only the immediate dominator of each node, it's
// possible to get its full list of dominators by looking up the dominator
// of each dominator. (See the `impl Iterator for Iter` definition).
// of each dominator.
immediate_dominators: IndexVec<N, Option<N>>,
time: IndexVec<N, Time>,
}
Expand Down Expand Up @@ -377,13 +377,6 @@ impl<Node: Idx> Dominators<Node> {
}
}

/// Provides an iterator over each dominator up the CFG, for the given Node.
/// See the `impl Iterator for Iter` definition to understand how this works.
pub fn dominators(&self, node: Node) -> Iter<'_, Node> {
assert!(self.is_reachable(node), "node {node:?} is not reachable");
Iter { dom_tree: self, node: Some(node) }
}

/// Provide deterministic ordering of nodes such that, if any two nodes have a dominator
/// relationship, the dominator will always precede the dominated. (The relative ordering
/// of two unrelated nodes will also be consistent, but otherwise the order has no
Expand Down Expand Up @@ -413,24 +406,6 @@ impl<Node: Idx> Dominators<Node> {
}
}

pub struct Iter<'dom, Node: Idx> {
dom_tree: &'dom Dominators<Node>,
node: Option<Node>,
}

impl<'dom, Node: Idx> Iterator for Iter<'dom, Node> {
type Item = Node;

fn next(&mut self) -> Option<Self::Item> {
if let Some(node) = self.node {
self.node = self.dom_tree.immediate_dominator(node);
Some(node)
} else {
None
}
}
}

/// Describes the number of vertices discovered at the time when processing of a particular vertex
/// started and when it finished. Both values are zero for unreachable vertices.
#[derive(Copy, Clone, Default, Debug)]
Expand Down