From 86ea7eeabe30c98bbe1651a51d03cb89776724e7 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 16 Feb 2016 09:26:07 +0000 Subject: Build dominator tree before generating HInstructions Second CL in the series of merging HGraphBuilder and SsaBuilder. This patch refactors the builders so that dominator tree can be built before any HInstructions are generated. This puts the SsaBuilder removal of HLoadLocals/HStoreLocals straight after HGraphBuilder's HInstruction generation phase. Next CL will therefore be able to merge them. This patch also adds util classes for iterating bytecode and switch tables which allowed to simplify the code. Bug: 27894376 Change-Id: Ic425d298b2e6e7980481ed697230b1a0b7904526 --- compiler/optimizing/ssa_builder.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'compiler/optimizing/ssa_builder.h') diff --git a/compiler/optimizing/ssa_builder.h b/compiler/optimizing/ssa_builder.h index 2dae9c2de0..83da3781b4 100644 --- a/compiler/optimizing/ssa_builder.h +++ b/compiler/optimizing/ssa_builder.h @@ -49,8 +49,9 @@ static constexpr int kDefaultNumberOfLoops = 2; */ class SsaBuilder : public HGraphVisitor { public: - SsaBuilder(HGraph* graph, StackHandleScopeCollection* handles) + SsaBuilder(HGraph* graph, const DexFile::CodeItem& code_item, StackHandleScopeCollection* handles) : HGraphVisitor(graph), + code_item_(code_item), handles_(handles), agets_fixed_(false), current_locals_(nullptr), @@ -105,6 +106,11 @@ class SsaBuilder : public HGraphVisitor { void RemoveRedundantUninitializedStrings(); + // Returns whether `instruction` is the first generated HInstruction for its + // dex_pc position. + bool IsFirstAtThrowingDexPc(HInstruction* instruction) const; + + const DexFile::CodeItem& code_item_; StackHandleScopeCollection* const handles_; // True if types of ambiguous ArrayGets have been resolved. -- cgit v1.2.3-59-g8ed1b