AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[turbofan] Access merge environment map more efficiently

Browse Source 
Review-Url: https://codereview.chromium.org/2521313002
Cr-Commit-Position: refs/heads/master@{#41481}
This commit is contained in:
leszeks 2016-12-05 03:09:30 -08:00 committed by Commit bot
parent 6f6795b508
commit 8590e8d4d5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/bytecode-graph-builder.cc
View File

@ -1862,11 +1862,12 @@ void BytecodeGraphBuilder::VisitIllegal() {
void BytecodeGraphBuilder::VisitNop() {} void BytecodeGraphBuilder::VisitNop() {}
void BytecodeGraphBuilder::SwitchToMergeEnvironment(int current_offset) { void BytecodeGraphBuilder::SwitchToMergeEnvironment(int current_offset) {
if (merge_environments_[current_offset] != nullptr) { auto it = merge_environments_.find(current_offset);
if (it != merge_environments_.end()) {
if (environment() != nullptr) { if (environment() != nullptr) {
merge_environments_[current_offset]->Merge(environment()); it->second->Merge(environment());
} }
set_environment(merge_environments_[current_offset]); set_environment(it->second);
} }
} }
@ -1880,15 +1881,16 @@ void BytecodeGraphBuilder::BuildLoopHeaderEnvironment(int current_offset) {
void BytecodeGraphBuilder::MergeIntoSuccessorEnvironment(int target_offset) { void BytecodeGraphBuilder::MergeIntoSuccessorEnvironment(int target_offset) {
BuildLoopExitsForBranch(target_offset); BuildLoopExitsForBranch(target_offset);
if (merge_environments_[target_offset] == nullptr) { Environment*& merge_environment = merge_environments_[target_offset];
if (merge_environment == nullptr) {
// Append merge nodes to the environment. We may merge here with another // Append merge nodes to the environment. We may merge here with another
// environment. So add a place holder for merge nodes. We may add redundant // environment. So add a place holder for merge nodes. We may add redundant
// but will be eliminated in a later pass. // but will be eliminated in a later pass.
// TODO(mstarzinger): Be smarter about this! // TODO(mstarzinger): Be smarter about this!
NewMerge(); NewMerge();
merge_environments_[target_offset] = environment(); merge_environment = environment();
} else { } else {
merge_environments_[target_offset]->Merge(environment()); merge_environment->Merge(environment());
} }
set_environment(nullptr); set_environment(nullptr);
} }