Dominator analysis interface clean.
Remove the CFG requirement when querying a dominator/post-dominator from an IRContext.
Updated all uses of the function and tests.
diff --git a/source/opt/copy_prop_arrays.cpp b/source/opt/copy_prop_arrays.cpp
index eb4694f..1d1e80c 100644
--- a/source/opt/copy_prop_arrays.cpp
+++ b/source/opt/copy_prop_arrays.cpp
@@ -166,7 +166,7 @@
ir::Instruction* store_inst) {
ir::BasicBlock* store_block = context()->get_instr_block(store_inst);
opt::DominatorAnalysis* dominator_analysis =
- context()->GetDominatorAnalysis(store_block->GetParent(), *cfg());
+ context()->GetDominatorAnalysis(store_block->GetParent());
return get_def_use_mgr()->WhileEachUser(
ptr_inst,
diff --git a/source/opt/dominator_analysis.h b/source/opt/dominator_analysis.h
index ea10ce3..c40a344 100644
--- a/source/opt/dominator_analysis.h
+++ b/source/opt/dominator_analysis.h
@@ -30,9 +30,7 @@
explicit DominatorAnalysisBase(bool is_post_dom) : tree_(is_post_dom) {}
// Calculates the dominator (or postdominator) tree for given function |f|.
- inline void InitializeTree(const ir::Function* f, const ir::CFG& cfg) {
- tree_.InitializeTree(f, cfg);
- }
+ inline void InitializeTree(const ir::Function* f) { tree_.InitializeTree(f); }
// Returns true if BasicBlock |a| dominates BasicBlock |b|.
inline bool Dominates(const ir::BasicBlock* a,
diff --git a/source/opt/dominator_tree.cpp b/source/opt/dominator_tree.cpp
index 39339d0..01bf820 100644
--- a/source/opt/dominator_tree.cpp
+++ b/source/opt/dominator_tree.cpp
@@ -18,6 +18,7 @@
#include "cfa.h"
#include "dominator_tree.h"
+#include "ir_context.h"
using namespace spvtools;
using namespace spvtools::opt;
@@ -324,13 +325,14 @@
CFA<ir::BasicBlock>::CalculateDominators(postorder, predecessor_functor);
}
-void DominatorTree::InitializeTree(const ir::Function* f, const ir::CFG& cfg) {
+void DominatorTree::InitializeTree(const ir::Function* f) {
ClearTree();
// Skip over empty functions.
if (f->cbegin() == f->cend()) {
return;
}
+ const ir::CFG& cfg = *f->context()->cfg();
const ir::BasicBlock* dummy_start_node =
postdominator_ ? cfg.pseudo_exit_block() : cfg.pseudo_entry_block();
diff --git a/source/opt/dominator_tree.h b/source/opt/dominator_tree.h
index 39d5e02..ee2026b 100644
--- a/source/opt/dominator_tree.h
+++ b/source/opt/dominator_tree.h
@@ -158,7 +158,7 @@
// Build the (post-)dominator tree for the function |f|
// Any existing data will be overwritten
- void InitializeTree(const ir::Function* f, const ir::CFG& cfg);
+ void InitializeTree(const ir::Function* f);
// Check if the basic block |a| dominates the basic block |b|.
bool Dominates(const ir::BasicBlock* a, const ir::BasicBlock* b) const;
diff --git a/source/opt/if_conversion.cpp b/source/opt/if_conversion.cpp
index 951b7ea..3404132 100644
--- a/source/opt/if_conversion.cpp
+++ b/source/opt/if_conversion.cpp
@@ -23,8 +23,7 @@
bool modified = false;
std::vector<ir::Instruction*> to_kill;
for (auto& func : *get_module()) {
- DominatorAnalysis* dominators =
- context()->GetDominatorAnalysis(&func, *cfg());
+ DominatorAnalysis* dominators = context()->GetDominatorAnalysis(&func);
for (auto& block : func) {
// Check if it is possible for |block| to have phis that can be
// transformed.
diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp
index ea1c0b9..79fab67 100644
--- a/source/opt/ir_context.cpp
+++ b/source/opt/ir_context.cpp
@@ -564,14 +564,13 @@
}
// Gets the dominator analysis for function |f|.
-opt::DominatorAnalysis* IRContext::GetDominatorAnalysis(const ir::Function* f,
- const ir::CFG& in_cfg) {
+opt::DominatorAnalysis* IRContext::GetDominatorAnalysis(const ir::Function* f) {
if (!AreAnalysesValid(kAnalysisDominatorAnalysis)) {
ResetDominatorAnalysis();
}
if (dominator_trees_.find(f) == dominator_trees_.end()) {
- dominator_trees_[f].InitializeTree(f, in_cfg);
+ dominator_trees_[f].InitializeTree(f);
}
return &dominator_trees_[f];
@@ -579,13 +578,13 @@
// Gets the postdominator analysis for function |f|.
opt::PostDominatorAnalysis* IRContext::GetPostDominatorAnalysis(
- const ir::Function* f, const ir::CFG& in_cfg) {
+ const ir::Function* f) {
if (!AreAnalysesValid(kAnalysisDominatorAnalysis)) {
ResetDominatorAnalysis();
}
if (post_dominator_trees_.find(f) == post_dominator_trees_.end()) {
- post_dominator_trees_[f].InitializeTree(f, in_cfg);
+ post_dominator_trees_[f].InitializeTree(f);
}
return &post_dominator_trees_[f];
diff --git a/source/opt/ir_context.h b/source/opt/ir_context.h
index ec34b97..e294feb 100644
--- a/source/opt/ir_context.h
+++ b/source/opt/ir_context.h
@@ -402,22 +402,10 @@
ir::LoopDescriptor* GetLoopDescriptor(const ir::Function* f);
// Gets the dominator analysis for function |f|.
- opt::DominatorAnalysis* GetDominatorAnalysis(const ir::Function* f,
- const ir::CFG&);
-
- // Gets the dominator analysis for function |f|.
- opt::DominatorAnalysis* GetDominatorAnalysis(const ir::Function* f) {
- return GetDominatorAnalysis(f, *cfg());
- }
+ opt::DominatorAnalysis* GetDominatorAnalysis(const ir::Function* f);
// Gets the postdominator analysis for function |f|.
- opt::PostDominatorAnalysis* GetPostDominatorAnalysis(const ir::Function* f,
- const ir::CFG&);
-
- // Gets the postdominator analysis for function |f|.
- opt::PostDominatorAnalysis* GetPostDominatorAnalysis(const ir::Function* f) {
- return GetPostDominatorAnalysis(f, *cfg());
- }
+ opt::PostDominatorAnalysis* GetPostDominatorAnalysis(const ir::Function* f);
// Remove the dominator tree of |f| from the cache.
inline void RemoveDominatorAnalysis(const ir::Function* f) {
diff --git a/source/opt/licm_pass.cpp b/source/opt/licm_pass.cpp
index 7faa21d..abefb44 100644
--- a/source/opt/licm_pass.cpp
+++ b/source/opt/licm_pass.cpp
@@ -95,8 +95,7 @@
bb->ForEachInst(hoist_inst, false);
}
- opt::DominatorAnalysis* dom_analysis =
- context()->GetDominatorAnalysis(f, *cfg());
+ opt::DominatorAnalysis* dom_analysis = context()->GetDominatorAnalysis(f);
opt::DominatorTree& dom_tree = dom_analysis->GetDomTree();
for (opt::DominatorTreeNode* child_dom_tree_node :
diff --git a/source/opt/local_single_store_elim_pass.cpp b/source/opt/local_single_store_elim_pass.cpp
index af5e124..92d6a52 100644
--- a/source/opt/local_single_store_elim_pass.cpp
+++ b/source/opt/local_single_store_elim_pass.cpp
@@ -219,7 +219,7 @@
ir::Instruction* store_inst, const std::vector<ir::Instruction*>& uses) {
ir::BasicBlock* store_block = context()->get_instr_block(store_inst);
opt::DominatorAnalysis* dominator_analysis =
- context()->GetDominatorAnalysis(store_block->GetParent(), *cfg());
+ context()->GetDominatorAnalysis(store_block->GetParent());
uint32_t stored_id;
if (store_inst->opcode() == SpvOpStore)
diff --git a/source/opt/loop_descriptor.cpp b/source/opt/loop_descriptor.cpp
index 17b9ac7..9889b40 100644
--- a/source/opt/loop_descriptor.cpp
+++ b/source/opt/loop_descriptor.cpp
@@ -264,7 +264,7 @@
bool Loop::IsBasicBlockInLoopSlow(const BasicBlock* bb) {
assert(bb->GetParent() && "The basic block does not belong to a function");
opt::DominatorAnalysis* dom_analysis =
- context_->GetDominatorAnalysis(bb->GetParent(), *context_->cfg());
+ context_->GetDominatorAnalysis(bb->GetParent());
if (dom_analysis->IsReachable(bb) &&
!dom_analysis->Dominates(GetHeaderBlock(), bb))
return false;
@@ -472,8 +472,7 @@
void LoopDescriptor::PopulateList(const Function* f) {
IRContext* context = f->GetParent()->context();
- opt::DominatorAnalysis* dom_analysis =
- context->GetDominatorAnalysis(f, *context->cfg());
+ opt::DominatorAnalysis* dom_analysis = context->GetDominatorAnalysis(f);
ClearLoops();
diff --git a/source/opt/loop_peeling.cpp b/source/opt/loop_peeling.cpp
index 3738453..3da3a14 100644
--- a/source/opt/loop_peeling.cpp
+++ b/source/opt/loop_peeling.cpp
@@ -282,7 +282,7 @@
});
} else {
DominatorTree* dom_tree =
- &context_->GetDominatorAnalysis(loop_utils_.GetFunction(), cfg)
+ &context_->GetDominatorAnalysis(loop_utils_.GetFunction())
->GetDomTree();
ir::BasicBlock* condition_block = cfg.block(condition_block_id);
diff --git a/source/opt/loop_unswitch_pass.cpp b/source/opt/loop_unswitch_pass.cpp
index 964e765..5579e82 100644
--- a/source/opt/loop_unswitch_pass.cpp
+++ b/source/opt/loop_unswitch_pass.cpp
@@ -118,8 +118,7 @@
ir::CFG& cfg = *context_->cfg();
DominatorTree* dom_tree =
- &context_->GetDominatorAnalysis(function_, *context_->cfg())
- ->GetDomTree();
+ &context_->GetDominatorAnalysis(function_)->GetDomTree();
analysis::DefUseManager* def_use_mgr = context_->get_def_use_mgr();
LoopUtils loop_utils(context_, loop_);
@@ -849,8 +848,7 @@
return !loop_->IsInsideLoop(condition) &&
IsDynamicallyUniform(
condition, function_->entry().get(),
- context_->GetPostDominatorAnalysis(function_, *context_->cfg())
- ->GetDomTree());
+ context_->GetPostDominatorAnalysis(function_)->GetDomTree());
}
};
diff --git a/source/opt/loop_utils.cpp b/source/opt/loop_utils.cpp
index 36f75fe..b87f659 100644
--- a/source/opt/loop_utils.cpp
+++ b/source/opt/loop_utils.cpp
@@ -280,7 +280,7 @@
LCSSARewriter* lcssa_rewriter) {
ir::CFG& cfg = *context->cfg();
opt::DominatorTree& dom_tree =
- context->GetDominatorAnalysis(function, cfg)->GetDomTree();
+ context->GetDominatorAnalysis(function)->GetDomTree();
opt::analysis::DefUseManager* def_use_manager = context->get_def_use_mgr();
for (uint32_t bb_id : blocks) {
@@ -444,7 +444,7 @@
ir::Function* function = loop_->GetHeaderBlock()->GetParent();
ir::CFG& cfg = *context_->cfg();
opt::DominatorTree& dom_tree =
- context_->GetDominatorAnalysis(function, cfg)->GetDomTree();
+ context_->GetDominatorAnalysis(function)->GetDomTree();
std::unordered_set<ir::BasicBlock*> exit_bb;
{
diff --git a/source/opt/merge_return_pass.cpp b/source/opt/merge_return_pass.cpp
index 7fafd58..10d336c 100644
--- a/source/opt/merge_return_pass.cpp
+++ b/source/opt/merge_return_pass.cpp
@@ -193,7 +193,7 @@
uint32_t predecessor,
ir::Instruction& inst) {
opt::DominatorAnalysis* dom_tree =
- context()->GetDominatorAnalysis(merge_block->GetParent(), *cfg());
+ context()->GetDominatorAnalysis(merge_block->GetParent());
ir::BasicBlock* inst_bb = context()->get_instr_block(&inst);
if (inst.result_id() != 0) {
@@ -625,8 +625,7 @@
}
void MergeReturnPass::AddNewPhiNodes() {
- opt::DominatorAnalysis* dom_tree =
- context()->GetDominatorAnalysis(function_, *cfg());
+ opt::DominatorAnalysis* dom_tree = context()->GetDominatorAnalysis(function_);
std::list<ir::BasicBlock*> order;
cfg()->ComputeStructuredOrder(function_, &*function_->begin(), &order);
@@ -638,8 +637,7 @@
void MergeReturnPass::AddNewPhiNodes(ir::BasicBlock* bb, ir::BasicBlock* pred,
uint32_t header_id) {
- opt::DominatorAnalysis* dom_tree =
- context()->GetDominatorAnalysis(function_, *cfg());
+ opt::DominatorAnalysis* dom_tree = context()->GetDominatorAnalysis(function_);
// Insert as a stopping point. We do not have to add anything in the block or
// above because the header dominates |bb|.
diff --git a/source/opt/redundancy_elimination.cpp b/source/opt/redundancy_elimination.cpp
index 7e5c01d..347e2fe 100644
--- a/source/opt/redundancy_elimination.cpp
+++ b/source/opt/redundancy_elimination.cpp
@@ -29,7 +29,7 @@
// Build the dominator tree for this function. It is how the code is
// traversed.
opt::DominatorTree& dom_tree =
- context()->GetDominatorAnalysis(&func, *context()->cfg())->GetDomTree();
+ context()->GetDominatorAnalysis(&func)->GetDomTree();
// Keeps track of all ids that contain a given value number. We keep
// track of multiple values because they could have the same value, but
diff --git a/test/opt/dominator_tree/common_dominators.cpp b/test/opt/dominator_tree/common_dominators.cpp
index 612dc45..c91499b 100644
--- a/test/opt/dominator_tree/common_dominators.cpp
+++ b/test/opt/dominator_tree/common_dominators.cpp
@@ -69,9 +69,8 @@
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
EXPECT_NE(nullptr, context);
- ir::CFG cfg(context->module());
opt::DominatorAnalysis* analysis =
- context->GetDominatorAnalysis(&*context->module()->begin(), cfg);
+ context->GetDominatorAnalysis(&*context->module()->begin());
for (auto& block : *context->module()->begin()) {
EXPECT_EQ(&block, analysis->CommonDominator(&block, &block));
@@ -84,9 +83,8 @@
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
EXPECT_NE(nullptr, context);
- ir::CFG cfg(context->module());
opt::DominatorAnalysis* analysis =
- context->GetDominatorAnalysis(&*context->module()->begin(), cfg);
+ context->GetDominatorAnalysis(&*context->module()->begin());
EXPECT_EQ(
GetBlock(1u, context),
@@ -105,9 +103,8 @@
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
EXPECT_NE(nullptr, context);
- ir::CFG cfg(context->module());
opt::DominatorAnalysis* analysis =
- context->GetDominatorAnalysis(&*context->module()->begin(), cfg);
+ context->GetDominatorAnalysis(&*context->module()->begin());
EXPECT_EQ(
GetBlock(3u, context),
@@ -123,9 +120,8 @@
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
EXPECT_NE(nullptr, context);
- ir::CFG cfg(context->module());
opt::DominatorAnalysis* analysis =
- context->GetDominatorAnalysis(&*context->module()->begin(), cfg);
+ context->GetDominatorAnalysis(&*context->module()->begin());
EXPECT_EQ(
GetBlock(5u, context),
@@ -138,9 +134,8 @@
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
EXPECT_NE(nullptr, context);
- ir::CFG cfg(context->module());
opt::DominatorAnalysis* analysis =
- context->GetDominatorAnalysis(&*context->module()->begin(), cfg);
+ context->GetDominatorAnalysis(&*context->module()->begin());
EXPECT_EQ(nullptr, analysis->CommonDominator(GetBlock(10u, context),
GetBlock(11u, context)));
diff --git a/test/opt/dominator_tree/generated.cpp b/test/opt/dominator_tree/generated.cpp
index 80fd862..181aac0 100644
--- a/test/opt/dominator_tree/generated.cpp
+++ b/test/opt/dominator_tree/generated.cpp
@@ -122,8 +122,8 @@
// Test normal dominator tree
{
opt::DominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -187,8 +187,8 @@
// Test post dominator tree
{
opt::PostDominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -289,8 +289,8 @@
// Check normal dominator tree
{
opt::DominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -331,8 +331,8 @@
// Check post dominator tree
{
opt::PostDominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -410,8 +410,8 @@
// Check normal dominator tree
{
opt::DominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -492,8 +492,8 @@
// Check post dominator tree
{
opt::PostDominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -617,8 +617,8 @@
// Check normal dominator tree
{
opt::DominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -668,8 +668,8 @@
// Check post dominator tree.
{
opt::PostDominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// (strict) dominance checks.
for (uint32_t id : {10, 11, 12, 13, 14, 15})
@@ -747,8 +747,8 @@
// Check normal dominator tree
{
opt::DominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -782,8 +782,8 @@
// Check post dominator tree
{
opt::PostDominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
@@ -852,8 +852,8 @@
// Check dominator tree
{
opt::DominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
EXPECT_EQ(tree.GetRoot()->bb_, cfg.pseudo_entry_block());
@@ -880,8 +880,8 @@
// Check post dominator tree
{
opt::PostDominatorAnalysis dom_tree;
- ir::CFG cfg(module);
- dom_tree.InitializeTree(fn, cfg);
+ dom_tree.InitializeTree(fn);
+ const ir::CFG& cfg = *context->cfg();
// Inspect the actual tree
opt::DominatorTree& tree = dom_tree.GetDomTree();
diff --git a/test/opt/dominator_tree/nested_ifs.cpp b/test/opt/dominator_tree/nested_ifs.cpp
index fbb2d12..86b6dac 100644
--- a/test/opt/dominator_tree/nested_ifs.cpp
+++ b/test/opt/dominator_tree/nested_ifs.cpp
@@ -119,8 +119,7 @@
const ir::Function* f = spvtest::GetFunction(module, 4);
- ir::CFG cfg(module);
- opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f, cfg);
+ opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f);
EXPECT_TRUE(analysis->Dominates(5, 8));
EXPECT_TRUE(analysis->Dominates(5, 9));
diff --git a/test/opt/dominator_tree/nested_ifs_post.cpp b/test/opt/dominator_tree/nested_ifs_post.cpp
index a112af9..6fe2f38 100644
--- a/test/opt/dominator_tree/nested_ifs_post.cpp
+++ b/test/opt/dominator_tree/nested_ifs_post.cpp
@@ -119,9 +119,7 @@
const ir::Function* f = spvtest::GetFunction(module, 4);
- ir::CFG cfg(module);
- opt::PostDominatorAnalysis* analysis =
- context->GetPostDominatorAnalysis(f, cfg);
+ opt::PostDominatorAnalysis* analysis = context->GetPostDominatorAnalysis(f);
EXPECT_TRUE(analysis->Dominates(5, 5));
EXPECT_TRUE(analysis->Dominates(8, 8));
diff --git a/test/opt/dominator_tree/nested_loops.cpp b/test/opt/dominator_tree/nested_loops.cpp
index 4e5c072..9b6d4d5 100644
--- a/test/opt/dominator_tree/nested_loops.cpp
+++ b/test/opt/dominator_tree/nested_loops.cpp
@@ -359,8 +359,7 @@
<< text << std::endl;
const ir::Function* f = spvtest::GetFunction(module, 4);
- ir::CFG cfg(module);
- opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f, cfg);
+ opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f);
EXPECT_TRUE(analysis->Dominates(5, 10));
EXPECT_TRUE(analysis->Dominates(5, 46));
diff --git a/test/opt/dominator_tree/nested_loops_with_unreachables.cpp b/test/opt/dominator_tree/nested_loops_with_unreachables.cpp
index ab1b6a7..f1f06e2 100644
--- a/test/opt/dominator_tree/nested_loops_with_unreachables.cpp
+++ b/test/opt/dominator_tree/nested_loops_with_unreachables.cpp
@@ -287,8 +287,7 @@
<< text << std::endl;
const ir::Function* f = spvtest::GetFunction(module, 4);
- ir::CFG cfg(module);
- opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f, cfg);
+ opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f);
EXPECT_TRUE(analysis->Dominates(5, 10));
EXPECT_TRUE(analysis->Dominates(5, 14));
diff --git a/test/opt/dominator_tree/post.cpp b/test/opt/dominator_tree/post.cpp
index 2c786ae..361e001 100644
--- a/test/opt/dominator_tree/post.cpp
+++ b/test/opt/dominator_tree/post.cpp
@@ -148,8 +148,7 @@
const ir::Function* f = spvtest::GetFunction(module, 4);
ir::CFG cfg(module);
- opt::PostDominatorAnalysis* analysis =
- context->GetPostDominatorAnalysis(f, cfg);
+ opt::PostDominatorAnalysis* analysis = context->GetPostDominatorAnalysis(f);
EXPECT_TRUE(analysis->Dominates(19, 18));
EXPECT_TRUE(analysis->Dominates(19, 5));
diff --git a/test/opt/dominator_tree/simple.cpp b/test/opt/dominator_tree/simple.cpp
index 4cba7dc..2a5ad64 100644
--- a/test/opt/dominator_tree/simple.cpp
+++ b/test/opt/dominator_tree/simple.cpp
@@ -147,8 +147,8 @@
<< text << std::endl;
const ir::Function* f = spvtest::GetFunction(module, 4);
- ir::CFG cfg(module);
- opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f, cfg);
+ opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f);
+ const ir::CFG& cfg = *context->cfg();
opt::DominatorTree& tree = analysis->GetDomTree();
diff --git a/test/opt/dominator_tree/switch_case_fallthrough.cpp b/test/opt/dominator_tree/switch_case_fallthrough.cpp
index 2b2e27b..00eb630 100644
--- a/test/opt/dominator_tree/switch_case_fallthrough.cpp
+++ b/test/opt/dominator_tree/switch_case_fallthrough.cpp
@@ -138,8 +138,7 @@
<< text << std::endl;
const ir::Function* f = spvtest::GetFunction(module, 4);
- ir::CFG cfg(module);
- opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f, cfg);
+ opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f);
EXPECT_TRUE(analysis->Dominates(5, 5));
EXPECT_TRUE(analysis->Dominates(5, 17));
diff --git a/test/opt/dominator_tree/unreachable_for.cpp b/test/opt/dominator_tree/unreachable_for.cpp
index a720cf4..6c52adb 100644
--- a/test/opt/dominator_tree/unreachable_for.cpp
+++ b/test/opt/dominator_tree/unreachable_for.cpp
@@ -89,8 +89,7 @@
<< text << std::endl;
const ir::Function* f = spvtest::GetFunction(module, 4);
- ir::CFG cfg(module);
- opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f, cfg);
+ opt::DominatorAnalysis* analysis = context->GetDominatorAnalysis(f);
EXPECT_TRUE(analysis->Dominates(5, 5));
EXPECT_TRUE(analysis->Dominates(5, 10));
EXPECT_TRUE(analysis->Dominates(5, 14));
diff --git a/test/opt/dominator_tree/unreachable_for_post.cpp b/test/opt/dominator_tree/unreachable_for_post.cpp
index 18a112e..7bb460d 100644
--- a/test/opt/dominator_tree/unreachable_for_post.cpp
+++ b/test/opt/dominator_tree/unreachable_for_post.cpp
@@ -90,9 +90,7 @@
const ir::Function* f = spvtest::GetFunction(module, 4);
- ir::CFG cfg(module);
- opt::PostDominatorAnalysis* analysis =
- context->GetPostDominatorAnalysis(f, cfg);
+ opt::PostDominatorAnalysis* analysis = context->GetPostDominatorAnalysis(f);
EXPECT_TRUE(analysis->Dominates(12, 12));
EXPECT_TRUE(analysis->Dominates(12, 14));
