Tidy up calls to analyze_branch.
This commit is contained in:
@@ -340,7 +340,7 @@ impl DominatorTree {
|
||||
/// post-order except for the insertion of the new EBB header at the split point.
|
||||
fn push_successors(&mut self, func: &Function, ebb: Ebb) {
|
||||
for inst in func.layout.ebb_insts(ebb) {
|
||||
match func.dfg[inst].analyze_branch(&func.dfg.value_lists) {
|
||||
match func.dfg.analyze_branch(inst) {
|
||||
BranchInfo::SingleDest(succ, _) => {
|
||||
if self.nodes[succ].rpo_number == 0 {
|
||||
self.nodes[succ].rpo_number = SEEN;
|
||||
|
||||
@@ -108,7 +108,7 @@ impl ControlFlowGraph {
|
||||
|
||||
fn compute_ebb(&mut self, func: &Function, ebb: Ebb) {
|
||||
for inst in func.layout.ebb_insts(ebb) {
|
||||
match func.dfg[inst].analyze_branch(&func.dfg.value_lists) {
|
||||
match func.dfg.analyze_branch(inst) {
|
||||
BranchInfo::SingleDest(dest, _) => {
|
||||
self.add_edge((ebb, inst), dest);
|
||||
}
|
||||
|
||||
@@ -908,7 +908,7 @@ impl<'a> Context<'a> {
|
||||
|
||||
let inst = self.cur.current_inst().expect("Not on an instruction");
|
||||
let ctx = self.liveness.context(&self.cur.func.layout);
|
||||
match self.cur.func.dfg[inst].analyze_branch(&self.cur.func.dfg.value_lists) {
|
||||
match self.cur.func.dfg.analyze_branch(inst) {
|
||||
NotABranch => false,
|
||||
SingleDest(ebb, _) => {
|
||||
let lr = &self.liveness[value];
|
||||
|
||||
@@ -260,7 +260,7 @@ impl LiveValueTracker {
|
||||
) -> (&[LiveValue], &[LiveValue], &[LiveValue]) {
|
||||
// Save a copy of the live values before any branches or jumps that could be somebody's
|
||||
// immediate dominator.
|
||||
match dfg[inst].analyze_branch(&dfg.value_lists) {
|
||||
match dfg.analyze_branch(inst) {
|
||||
BranchInfo::NotABranch => {}
|
||||
_ => self.save_idom_live_set(inst),
|
||||
}
|
||||
|
||||
@@ -274,7 +274,7 @@ impl<'a> LocationVerifier<'a> {
|
||||
};
|
||||
let dfg = &self.func.dfg;
|
||||
|
||||
match dfg[inst].analyze_branch(&dfg.value_lists) {
|
||||
match dfg.analyze_branch(inst) {
|
||||
NotABranch => {
|
||||
panic!(
|
||||
"No branch information for {}",
|
||||
|
||||
@@ -693,7 +693,7 @@ impl<'a> Verifier<'a> {
|
||||
}
|
||||
|
||||
fn typecheck_variable_args(&self, inst: Inst) -> Result {
|
||||
match self.func.dfg[inst].analyze_branch(&self.func.dfg.value_lists) {
|
||||
match self.func.dfg.analyze_branch(inst) {
|
||||
BranchInfo::SingleDest(ebb, _) => {
|
||||
let iter = self.func.dfg.ebb_params(ebb).iter().map(|&v| {
|
||||
self.func.dfg.value_type(v)
|
||||
|
||||
Reference in New Issue
Block a user