aboutsummaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2017-04-17 12:20:05 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2017-04-21 10:39:58 +0200
commit30989d30db190e42dd113ce841b2f1d91e56424e (patch)
treeba6b69b6c928f377f36adc5f5d601922393f00d1 /deps
parent90476ac6ee070f809894cbb28c4af81c5e3255eb (diff)
downloadandroid-node-v8-30989d30db190e42dd113ce841b2f1d91e56424e.tar.gz
android-node-v8-30989d30db190e42dd113ce841b2f1d91e56424e.tar.bz2
android-node-v8-30989d30db190e42dd113ce841b2f1d91e56424e.zip
v8: fix stack overflow in recursive method
HGlobalValueNumberingPhase::CollectSideEffectsOnPathsToDominatedBlock() used to self-recurse before this commit, causing stack overflows on systems with small stack sizes. Make it non-recursive by storing intermediate results in a heap-allocated list. Fixes: https://github.com/nodejs/node/issues/11991 PR-URL: https://github.com/nodejs/node/pull/12460 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Yang Guo <yangguo@chromium.org>
Diffstat (limited to 'deps')
-rw-r--r--deps/v8/src/crankshaft/hydrogen-gvn.cc28
1 files changed, 17 insertions, 11 deletions
diff --git a/deps/v8/src/crankshaft/hydrogen-gvn.cc b/deps/v8/src/crankshaft/hydrogen-gvn.cc
index e6ddd7526b..bf51bad4bb 100644
--- a/deps/v8/src/crankshaft/hydrogen-gvn.cc
+++ b/deps/v8/src/crankshaft/hydrogen-gvn.cc
@@ -5,6 +5,8 @@
#include "src/crankshaft/hydrogen-gvn.h"
#include "src/crankshaft/hydrogen.h"
+#include "src/list.h"
+#include "src/list-inl.h"
#include "src/v8.h"
namespace v8 {
@@ -650,19 +652,23 @@ SideEffects
HGlobalValueNumberingPhase::CollectSideEffectsOnPathsToDominatedBlock(
HBasicBlock* dominator, HBasicBlock* dominated) {
SideEffects side_effects;
- for (int i = 0; i < dominated->predecessors()->length(); ++i) {
- HBasicBlock* block = dominated->predecessors()->at(i);
- if (dominator->block_id() < block->block_id() &&
- block->block_id() < dominated->block_id() &&
- !visited_on_paths_.Contains(block->block_id())) {
- visited_on_paths_.Add(block->block_id());
- side_effects.Add(block_side_effects_[block->block_id()]);
- if (block->IsLoopHeader()) {
- side_effects.Add(loop_side_effects_[block->block_id()]);
+ List<HBasicBlock*> blocks;
+ for (;;) {
+ for (int i = 0; i < dominated->predecessors()->length(); ++i) {
+ HBasicBlock* block = dominated->predecessors()->at(i);
+ if (dominator->block_id() < block->block_id() &&
+ block->block_id() < dominated->block_id() &&
+ !visited_on_paths_.Contains(block->block_id())) {
+ visited_on_paths_.Add(block->block_id());
+ side_effects.Add(block_side_effects_[block->block_id()]);
+ if (block->IsLoopHeader()) {
+ side_effects.Add(loop_side_effects_[block->block_id()]);
+ }
+ blocks.Add(block);
}
- side_effects.Add(CollectSideEffectsOnPathsToDominatedBlock(
- dominator, block));
}
+ if (blocks.is_empty()) break;
+ dominated = blocks.RemoveLast();
}
return side_effects;
}