diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-06-19 13:23:56 +0200 |
---|---|---|
committer | Rod Vagg <rod@vagg.org> | 2015-08-04 11:56:14 -0700 |
commit | 70d1f32f5605465a1a630a64f6f0d35f96c7709d (patch) | |
tree | 0a349040a686eafcb0a09943ebc733477dce2781 /deps/v8/src/compiler/osr.cc | |
parent | 4643b8b6671607a7aff60cbbd0b384dcf2f6959e (diff) | |
download | node-new-70d1f32f5605465a1a630a64f6f0d35f96c7709d.tar.gz |
deps: update v8 to 4.4.63.9
Upgrade the bundled V8 and update code in src/ and lib/ to the new API.
Notable backwards incompatible changes are the removal of the smalloc
module and dropped support for CESU-8 decoding. CESU-8 support can be
brought back if necessary by doing UTF-8 decoding ourselves.
This commit includes https://codereview.chromium.org/1192973004 to fix
a build error on python 2.6 systems. The original commit log follows:
Use optparse in js2c.py for python compatibility
Without this change, V8 won't build on RHEL/CentOS 6 because the
distro python is too old to know about the argparse module.
PR-URL: https://github.com/nodejs/io.js/pull/2022
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/v8/src/compiler/osr.cc')
-rw-r--r-- | deps/v8/src/compiler/osr.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/deps/v8/src/compiler/osr.cc b/deps/v8/src/compiler/osr.cc index 2ab5d73984..d8ccc79c9f 100644 --- a/deps/v8/src/compiler/osr.cc +++ b/deps/v8/src/compiler/osr.cc @@ -285,7 +285,7 @@ static void TransferOsrValueTypesFromLoopPhis(Zone* zone, Node* osr_loop_entry, } -bool OsrHelper::Deconstruct(JSGraph* jsgraph, CommonOperatorBuilder* common, +void OsrHelper::Deconstruct(JSGraph* jsgraph, CommonOperatorBuilder* common, Zone* tmp_zone) { Graph* graph = jsgraph->graph(); Node* osr_normal_entry = nullptr; @@ -303,7 +303,7 @@ bool OsrHelper::Deconstruct(JSGraph* jsgraph, CommonOperatorBuilder* common, if (osr_loop_entry == nullptr) { // No OSR entry found, do nothing. CHECK(osr_normal_entry); - return true; + return; } for (Node* use : osr_loop_entry->uses()) { @@ -339,14 +339,12 @@ bool OsrHelper::Deconstruct(JSGraph* jsgraph, CommonOperatorBuilder* common, // but we need to avoid that because the osr_loop is reachable through // the second input, so reduce it and its phis manually. osr_loop->ReplaceInput(0, dead); - Node* node = ControlReducer::ReduceMerge(jsgraph, common, osr_loop); + Node* node = ControlReducer::ReduceMerge(jsgraph, osr_loop); if (node != osr_loop) osr_loop->ReplaceUses(node); // Run the normal control reduction, which naturally trims away the dead // parts of the graph. - ControlReducer::ReduceGraph(tmp_zone, jsgraph, common); - - return true; + ControlReducer::ReduceGraph(tmp_zone, jsgraph); } |