Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: src/compiler/wasm-compiler.cc

Issue 2226163004: [turbofan] Ensure nodes without kNoThrow have only IfSuccess or IfException uses. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Merge with master Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/compiler/js-typed-lowering.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler/wasm-compiler.cc
diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc
index 4285f58f7e49640dd59024adf14c154884bfddfd..5001eb014490bd6c0d2f6cd89226a9cdd24188ba 100644
--- a/src/compiler/wasm-compiler.cc
+++ b/src/compiler/wasm-compiler.cc
@@ -249,8 +249,8 @@ class WasmTrapHelper : public ZoneObject {
Node* node = graph()->NewNode(
common()->Call(desc), static_cast<int>(arraysize(inputs)), inputs);
- *control_ptr = node;
*effect_ptr = node;
+ *control_ptr = graph()->NewNode(common()->IfSuccess(), node);
ahaas 2016/08/10 10:34:58 node is a call to Runtime::ThrowWasmError, which h
bgeron 2016/08/10 10:41:56 Nope, that's it! Committing.
}
if (false) {
// End the control flow with a throw
@@ -1662,7 +1662,7 @@ Node* WasmGraphBuilder::BuildGrowMemory(Node* input) {
Runtime::FunctionId function_id = Runtime::kWasmGrowMemory;
const Runtime::Function* function = Runtime::FunctionForId(function_id);
CallDescriptor* desc = Linkage::GetRuntimeCallDescriptor(
- jsgraph()->zone(), function_id, function->nargs, Operator::kNoProperties,
+ jsgraph()->zone(), function_id, function->nargs, Operator::kNoThrow,
CallDescriptor::kNoFlags);
Node** control_ptr = control_;
Node** effect_ptr = effect_;
@@ -1678,7 +1678,6 @@ Node* WasmGraphBuilder::BuildGrowMemory(Node* input) {
*control_ptr};
Node* node = graph()->NewNode(jsgraph()->common()->Call(desc),
static_cast<int>(arraysize(inputs)), inputs);
- *control_ptr = node;
*effect_ptr = node;
node = BuildChangeSmiToInt32(node);
return node;
@@ -2229,8 +2228,8 @@ Node* WasmGraphBuilder::BuildJavaScriptToNumber(Node* node, Node* context,
Node* result = graph()->NewNode(jsgraph()->common()->Call(desc), stub_code,
node, context, effect, control);
- *control_ = result;
*effect_ = result;
+ *control_ = graph()->NewNode(jsgraph()->common()->IfSuccess(), result);
return result;
}
« no previous file with comments | « src/compiler/js-typed-lowering.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698