Make the constant and type manager analyses. (#2250)
Currently it is impossible to invalidate the constnat and type manager.
However, the compact ids pass changes the ids for the types and
constants, which makes them invalid. This change will make them
analyses that have to been explicitly marked as preserved by passes.
This will allow compact ids to invalidate them.
Fixes #2220.
diff --git a/source/opt/aggressive_dead_code_elim_pass.h b/source/opt/aggressive_dead_code_elim_pass.h
index b4b34b0..c043a96 100644
--- a/source/opt/aggressive_dead_code_elim_pass.h
+++ b/source/opt/aggressive_dead_code_elim_pass.h
@@ -49,7 +49,9 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse | IRContext::kAnalysisInstrToBlockMapping;
+ return IRContext::kAnalysisDefUse |
+ IRContext::kAnalysisInstrToBlockMapping |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/block_merge_pass.h b/source/opt/block_merge_pass.h
index be14b02..3ae7a5c 100644
--- a/source/opt/block_merge_pass.h
+++ b/source/opt/block_merge_pass.h
@@ -44,7 +44,8 @@
return IRContext::kAnalysisDefUse |
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/ccp_pass.h b/source/opt/ccp_pass.h
index 178fd12..527f459 100644
--- a/source/opt/ccp_pass.h
+++ b/source/opt/ccp_pass.h
@@ -40,7 +40,8 @@
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
IRContext::kAnalysisCFG | IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/cfg_cleanup_pass.h b/source/opt/cfg_cleanup_pass.h
index afbc67c..5095428 100644
--- a/source/opt/cfg_cleanup_pass.h
+++ b/source/opt/cfg_cleanup_pass.h
@@ -30,7 +30,8 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse;
+ return IRContext::kAnalysisDefUse | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
};
diff --git a/source/opt/combine_access_chains.h b/source/opt/combine_access_chains.h
index 75885da..531209e 100644
--- a/source/opt/combine_access_chains.h
+++ b/source/opt/combine_access_chains.h
@@ -33,7 +33,8 @@
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
IRContext::kAnalysisCFG | IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/copy_prop_arrays.h b/source/opt/copy_prop_arrays.h
index ed9da0e..eb7cc68 100644
--- a/source/opt/copy_prop_arrays.h
+++ b/source/opt/copy_prop_arrays.h
@@ -47,7 +47,8 @@
return IRContext::kAnalysisDefUse | IRContext::kAnalysisCFG |
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisLoopAnalysis | IRContext::kAnalysisDecorations |
- IRContext::kAnalysisDominatorAnalysis | IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisDominatorAnalysis | IRContext::kAnalysisNameMap |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/dead_branch_elim_pass.h b/source/opt/dead_branch_elim_pass.h
index a3a4f5a..4a1b6b4 100644
--- a/source/opt/dead_branch_elim_pass.h
+++ b/source/opt/dead_branch_elim_pass.h
@@ -44,7 +44,9 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse | IRContext::kAnalysisInstrToBlockMapping;
+ return IRContext::kAnalysisDefUse |
+ IRContext::kAnalysisInstrToBlockMapping |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/dead_insert_elim_pass.h b/source/opt/dead_insert_elim_pass.h
index 0b111d0..01f12bb 100644
--- a/source/opt/dead_insert_elim_pass.h
+++ b/source/opt/dead_insert_elim_pass.h
@@ -45,7 +45,8 @@
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
IRContext::kAnalysisCFG | IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/dead_variable_elimination.h b/source/opt/dead_variable_elimination.h
index 40a7bc0..5dde71b 100644
--- a/source/opt/dead_variable_elimination.h
+++ b/source/opt/dead_variable_elimination.h
@@ -30,7 +30,8 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse;
+ return IRContext::kAnalysisDefUse | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/eliminate_dead_functions_pass.h b/source/opt/eliminate_dead_functions_pass.h
index 165e9a6..6ed5c42 100644
--- a/source/opt/eliminate_dead_functions_pass.h
+++ b/source/opt/eliminate_dead_functions_pass.h
@@ -30,7 +30,8 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse;
+ return IRContext::kAnalysisDefUse | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/if_conversion.h b/source/opt/if_conversion.h
index 609bdf3..db84e70 100644
--- a/source/opt/if_conversion.h
+++ b/source/opt/if_conversion.h
@@ -32,7 +32,8 @@
IRContext::Analysis GetPreservedAnalyses() override {
return IRContext::kAnalysisDefUse | IRContext::kAnalysisDominatorAnalysis |
IRContext::kAnalysisInstrToBlockMapping | IRContext::kAnalysisCFG |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/instrument_pass.h b/source/opt/instrument_pass.h
index baf510b..cfa76b1 100644
--- a/source/opt/instrument_pass.h
+++ b/source/opt/instrument_pass.h
@@ -75,7 +75,8 @@
return IRContext::kAnalysisDefUse |
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
- IRContext::kAnalysisNameMap | IRContext::kAnalysisBuiltinVarId;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisBuiltinVarId |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
protected:
diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp
index ad453ae..a2f207c 100644
--- a/source/opt/ir_context.cpp
+++ b/source/opt/ir_context.cpp
@@ -74,6 +74,12 @@
if (set & kAnalysisIdToFuncMapping) {
BuildIdToFuncMapping();
}
+ if (set & kAnalysisConstants) {
+ BuildConstantManager();
+ }
+ if (set & kAnalysisTypes) {
+ BuildTypeManager();
+ }
}
void IRContext::InvalidateAnalysesExceptFor(
@@ -117,6 +123,12 @@
if (analyses_to_invalidate & kAnalysisIdToFuncMapping) {
id_to_func_.clear();
}
+ if (analyses_to_invalidate & kAnalysisConstants) {
+ constant_mgr_.reset(nullptr);
+ }
+ if (analyses_to_invalidate & kAnalysisTypes) {
+ type_mgr_.reset(nullptr);
+ }
valid_analyses_ = Analysis(valid_analyses_ & ~analyses_to_invalidate);
}
diff --git a/source/opt/ir_context.h b/source/opt/ir_context.h
index 94bfd01..185b494 100644
--- a/source/opt/ir_context.h
+++ b/source/opt/ir_context.h
@@ -76,7 +76,9 @@
kAnalysisStructuredCFG = 1 << 11,
kAnalysisBuiltinVarId = 1 << 12,
kAnalysisIdToFuncMapping = 1 << 13,
- kAnalysisEnd = 1 << 14
+ kAnalysisConstants = 1 << 14,
+ kAnalysisTypes = 1 << 15,
+ kAnalysisEnd = 1 << 16
};
using ProcessFunction = std::function<bool(Function*)>;
@@ -292,8 +294,9 @@
// created yet, it creates one. NOTE: Once created, the constant manager
// remains active and it is never re-built.
analysis::ConstantManager* get_constant_mgr() {
- if (!constant_mgr_)
- constant_mgr_ = MakeUnique<analysis::ConstantManager>(this);
+ if (!AreAnalysesValid(kAnalysisConstants)) {
+ BuildConstantManager();
+ }
return constant_mgr_.get();
}
@@ -301,8 +304,9 @@
// yet, it creates one. NOTE: Once created, the type manager remains active it
// is never re-built.
analysis::TypeManager* get_type_mgr() {
- if (!type_mgr_)
- type_mgr_ = MakeUnique<analysis::TypeManager>(consumer(), this);
+ if (!AreAnalysesValid(kAnalysisTypes)) {
+ BuildTypeManager();
+ }
return type_mgr_.get();
}
@@ -584,6 +588,20 @@
valid_analyses_ = valid_analyses_ | kAnalysisStructuredCFG;
}
+ // Builds the constant manager from scratch, even if it was already
+ // valid.
+ void BuildConstantManager() {
+ constant_mgr_ = MakeUnique<analysis::ConstantManager>(this);
+ valid_analyses_ = valid_analyses_ | kAnalysisConstants;
+ }
+
+ // Builds the type manager from scratch, even if it was already
+ // valid.
+ void BuildTypeManager() {
+ type_mgr_ = MakeUnique<analysis::TypeManager>(consumer(), this);
+ valid_analyses_ = valid_analyses_ | kAnalysisTypes;
+ }
+
// Removes all computed dominator and post-dominator trees. This will force
// the context to rebuild the trees on demand.
void ResetDominatorAnalysis() {
diff --git a/source/opt/local_access_chain_convert_pass.h b/source/opt/local_access_chain_convert_pass.h
index 9d06890..1c7e3d5 100644
--- a/source/opt/local_access_chain_convert_pass.h
+++ b/source/opt/local_access_chain_convert_pass.h
@@ -44,7 +44,8 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse;
+ return IRContext::kAnalysisDefUse | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
using ProcessFunction = std::function<bool(Function*)>;
diff --git a/source/opt/local_redundancy_elimination.h b/source/opt/local_redundancy_elimination.h
index 9f55c8b..770457a 100644
--- a/source/opt/local_redundancy_elimination.h
+++ b/source/opt/local_redundancy_elimination.h
@@ -41,7 +41,8 @@
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
IRContext::kAnalysisCFG | IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
protected:
diff --git a/source/opt/local_single_block_elim_pass.h b/source/opt/local_single_block_elim_pass.h
index 3dead98..0fe7732 100644
--- a/source/opt/local_single_block_elim_pass.h
+++ b/source/opt/local_single_block_elim_pass.h
@@ -42,7 +42,9 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse | IRContext::kAnalysisInstrToBlockMapping;
+ return IRContext::kAnalysisDefUse |
+ IRContext::kAnalysisInstrToBlockMapping |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/local_single_store_elim_pass.h b/source/opt/local_single_store_elim_pass.h
index d3d64b8..4cf8bbb 100644
--- a/source/opt/local_single_store_elim_pass.h
+++ b/source/opt/local_single_store_elim_pass.h
@@ -45,7 +45,9 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse | IRContext::kAnalysisInstrToBlockMapping;
+ return IRContext::kAnalysisDefUse |
+ IRContext::kAnalysisInstrToBlockMapping |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/local_ssa_elim_pass.h b/source/opt/local_ssa_elim_pass.h
index 63d3c33..de80d5a 100644
--- a/source/opt/local_ssa_elim_pass.h
+++ b/source/opt/local_ssa_elim_pass.h
@@ -48,7 +48,9 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisDefUse | IRContext::kAnalysisInstrToBlockMapping;
+ return IRContext::kAnalysisDefUse |
+ IRContext::kAnalysisInstrToBlockMapping |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/loop_unroller.h b/source/opt/loop_unroller.h
index 41a91a2..71e7cca 100644
--- a/source/opt/loop_unroller.h
+++ b/source/opt/loop_unroller.h
@@ -34,7 +34,8 @@
return IRContext::kAnalysisDefUse |
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/merge_return_pass.h b/source/opt/merge_return_pass.h
index 238ab21..d7e18f0 100644
--- a/source/opt/merge_return_pass.h
+++ b/source/opt/merge_return_pass.h
@@ -104,7 +104,7 @@
Status Process() override;
IRContext::Analysis GetPreservedAnalyses() override {
- return IRContext::kAnalysisNone;
+ return IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/private_to_local_pass.h b/source/opt/private_to_local_pass.h
index f706e6e..4678530 100644
--- a/source/opt/private_to_local_pass.h
+++ b/source/opt/private_to_local_pass.h
@@ -35,7 +35,8 @@
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
IRContext::kAnalysisCFG | IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/process_lines_pass.h b/source/opt/process_lines_pass.h
index 91b2136..c988bfd 100644
--- a/source/opt/process_lines_pass.h
+++ b/source/opt/process_lines_pass.h
@@ -51,7 +51,8 @@
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
IRContext::kAnalysisCFG | IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/reduce_load_size.h b/source/opt/reduce_load_size.h
index 724a430..ccac49b 100644
--- a/source/opt/reduce_load_size.h
+++ b/source/opt/reduce_load_size.h
@@ -36,7 +36,8 @@
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisCombinators | IRContext::kAnalysisCFG |
IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisLoopAnalysis | IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisLoopAnalysis | IRContext::kAnalysisNameMap |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/scalar_replacement_pass.h b/source/opt/scalar_replacement_pass.h
index a82abf4..f5d7612 100644
--- a/source/opt/scalar_replacement_pass.h
+++ b/source/opt/scalar_replacement_pass.h
@@ -52,7 +52,8 @@
return IRContext::kAnalysisDefUse |
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
- IRContext::kAnalysisCFG | IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisCFG | IRContext::kAnalysisNameMap |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/simplification_pass.h b/source/opt/simplification_pass.h
index 348c96a..bcb88bf 100644
--- a/source/opt/simplification_pass.h
+++ b/source/opt/simplification_pass.h
@@ -33,7 +33,8 @@
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisDecorations | IRContext::kAnalysisCombinators |
IRContext::kAnalysisCFG | IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisNameMap | IRContext::kAnalysisConstants |
+ IRContext::kAnalysisTypes;
}
private:
diff --git a/source/opt/strip_reflect_info_pass.h b/source/opt/strip_reflect_info_pass.h
index 935a605..4e1999e 100644
--- a/source/opt/strip_reflect_info_pass.h
+++ b/source/opt/strip_reflect_info_pass.h
@@ -33,7 +33,8 @@
return IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisCombinators | IRContext::kAnalysisCFG |
IRContext::kAnalysisDominatorAnalysis |
- IRContext::kAnalysisLoopAnalysis | IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisLoopAnalysis | IRContext::kAnalysisNameMap |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
};
diff --git a/source/opt/vector_dce.h b/source/opt/vector_dce.h
index 4888699..638b34b 100644
--- a/source/opt/vector_dce.h
+++ b/source/opt/vector_dce.h
@@ -53,7 +53,8 @@
return IRContext::kAnalysisDefUse | IRContext::kAnalysisCFG |
IRContext::kAnalysisInstrToBlockMapping |
IRContext::kAnalysisLoopAnalysis | IRContext::kAnalysisDecorations |
- IRContext::kAnalysisDominatorAnalysis | IRContext::kAnalysisNameMap;
+ IRContext::kAnalysisDominatorAnalysis | IRContext::kAnalysisNameMap |
+ IRContext::kAnalysisConstants | IRContext::kAnalysisTypes;
}
private:
