diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2023-05-18 14:36:13 +0000 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2023-05-18 14:36:13 +0000 |
| commit | 7c8f29f02c279acfa7b0c353e2187ad268e25de8 (patch) | |
| tree | cbee62f49015511cefd587150d4afe6da04490b6 | |
| parent | 8c2c695c9ee6f5e0f9fb8ef1037f1ec9c9dd94a1 (diff) | |
Revert spurious changes.
| -rw-r--r-- | compiler/rustc_const_eval/src/transform/validate.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/dominators/tests.rs | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/compiler/rustc_const_eval/src/transform/validate.rs b/compiler/rustc_const_eval/src/transform/validate.rs index fae3589e6f1..3c350e25ba6 100644 --- a/compiler/rustc_const_eval/src/transform/validate.rs +++ b/compiler/rustc_const_eval/src/transform/validate.rs @@ -155,7 +155,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> { if self.unwind_edge_count <= 1 { return; } - let dom_tree = self.body.basic_blocks.dominators(); + let doms = self.body.basic_blocks.dominators(); let mut post_contract_node = FxHashMap::default(); // Reusing the allocation across invocations of the closure let mut dom_path = vec![]; @@ -164,7 +164,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> { if let Some(root) = post_contract_node.get(&bb) { break *root; } - let parent = dom_tree.immediate_dominator(bb).unwrap(); + let parent = doms.immediate_dominator(bb).unwrap(); dom_path.push(bb); if !self.body.basic_blocks[parent].is_cleanup { break bb; diff --git a/compiler/rustc_data_structures/src/graph/dominators/tests.rs b/compiler/rustc_data_structures/src/graph/dominators/tests.rs index 31531fe3e2a..8b124516623 100644 --- a/compiler/rustc_data_structures/src/graph/dominators/tests.rs +++ b/compiler/rustc_data_structures/src/graph/dominators/tests.rs @@ -6,8 +6,8 @@ use super::super::tests::TestGraph; fn diamond() { let graph = TestGraph::new(0, &[(0, 1), (0, 2), (1, 3), (2, 3)]); - let tree = dominators(&graph); - let immediate_dominators = &tree.immediate_dominators; + let dominators = dominators(&graph); + let immediate_dominators = &dominators.immediate_dominators; assert_eq!(immediate_dominators[0], None); assert_eq!(immediate_dominators[1], Some(0)); assert_eq!(immediate_dominators[2], Some(0)); @@ -22,8 +22,8 @@ fn paper() { &[(6, 5), (6, 4), (5, 1), (4, 2), (4, 3), (1, 2), (2, 3), (3, 2), (2, 1)], ); - let dom_tree = dominators(&graph); - let immediate_dominators = &dom_tree.immediate_dominators; + let dominators = dominators(&graph); + let immediate_dominators = &dominators.immediate_dominators; assert_eq!(immediate_dominators[0], None); // <-- note that 0 is not in graph assert_eq!(immediate_dominators[1], Some(6)); assert_eq!(immediate_dominators[2], Some(6)); @@ -47,9 +47,9 @@ fn paper_slt() { #[test] fn immediate_dominator() { let graph = TestGraph::new(1, &[(1, 2), (2, 3)]); - let tree = dominators(&graph); - assert_eq!(tree.immediate_dominator(0), None); - assert_eq!(tree.immediate_dominator(1), None); - assert_eq!(tree.immediate_dominator(2), Some(1)); - assert_eq!(tree.immediate_dominator(3), Some(2)); + let dominators = dominators(&graph); + assert_eq!(dominators.immediate_dominator(0), None); + assert_eq!(dominators.immediate_dominator(1), None); + assert_eq!(dominators.immediate_dominator(2), Some(1)); + assert_eq!(dominators.immediate_dominator(3), Some(2)); } |