| commit | c5610438f36f65235862a5f5020a739d29a5c32e | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Mon Aug 08 18:44:38 2016 +0100 |
| committer | Dirk Vogt <dirk@fairphone.com> | Fri Mar 17 16:06:37 2017 +0100 |
| tree | 846d2ea15b4932324d6507083a8b0f6086122398 | |
| parent | c1074e1b8891cf05f36a1cfb7ddc0364fb95d73c [diff] [blame] |
Merge V8 5.2.361.47 DO NOT MERGE https://chromium.googlesource.com/v8/v8/+/5.2.361.47 FPIIM-449 Change-Id: Ibec421b85a9b88cb3a432ada642e469fe7e78346 (cherry picked from commit bcf72ee8e3b26f1d0726869c7ddb3921c68b09a8)
diff --git a/src/compiler/node-properties.cc b/src/compiler/node-properties.cc index ac9cc34..2cf899b 100644 --- a/src/compiler/node-properties.cc +++ b/src/compiler/node-properties.cc
@@ -158,8 +158,9 @@ // static -void NodeProperties::ReplaceControlInput(Node* node, Node* control) { - node->ReplaceInput(FirstControlIndex(node), control); +void NodeProperties::ReplaceControlInput(Node* node, Node* control, int index) { + DCHECK(index < node->op()->ControlInputCount()); + node->ReplaceInput(FirstControlIndex(node) + index, control); }