Upgrade V8 to version 4.9.385.28
https://chromium.googlesource.com/v8/v8/+/4.9.385.28
FPIIM-449
Change-Id: I4b2e74289d4bf3667f2f3dc8aa2e541f63e26eb4
diff --git a/src/compiler/graph.cc b/src/compiler/graph.cc
index 995046b..3d4d6da 100644
--- a/src/compiler/graph.cc
+++ b/src/compiler/graph.cc
@@ -4,14 +4,12 @@
#include "src/compiler/graph.h"
-#include "src/compiler/common-operator.h"
-#include "src/compiler/graph-inl.h"
+#include <algorithm>
+
+#include "src/base/bits.h"
#include "src/compiler/node.h"
-#include "src/compiler/node-aux-data-inl.h"
#include "src/compiler/node-properties.h"
-#include "src/compiler/node-properties-inl.h"
-#include "src/compiler/opcodes.h"
-#include "src/compiler/operator-properties.h"
+#include "src/compiler/verifier.h"
namespace v8 {
namespace internal {
@@ -19,30 +17,61 @@
Graph::Graph(Zone* zone)
: zone_(zone),
- start_(NULL),
- end_(NULL),
+ start_(nullptr),
+ end_(nullptr),
mark_max_(0),
next_node_id_(0),
decorators_(zone) {}
void Graph::Decorate(Node* node) {
- for (ZoneVector<GraphDecorator*>::iterator i = decorators_.begin();
- i != decorators_.end(); ++i) {
- (*i)->Decorate(node);
+ for (auto const decorator : decorators_) {
+ decorator->Decorate(node);
}
}
+void Graph::AddDecorator(GraphDecorator* decorator) {
+ decorators_.push_back(decorator);
+}
+
+
+void Graph::RemoveDecorator(GraphDecorator* decorator) {
+ auto const it = std::find(decorators_.begin(), decorators_.end(), decorator);
+ DCHECK(it != decorators_.end());
+ decorators_.erase(it);
+}
+
+
Node* Graph::NewNode(const Operator* op, int input_count, Node** inputs,
bool incomplete) {
- DCHECK_LE(op->ValueInputCount(), input_count);
- Node* result = Node::New(this, input_count, inputs, incomplete);
- result->Initialize(op);
- if (!incomplete) {
- Decorate(result);
- }
- return result;
+ Node* node = NewNodeUnchecked(op, input_count, inputs, incomplete);
+ Verifier::VerifyNode(node);
+ return node;
+}
+
+
+Node* Graph::NewNodeUnchecked(const Operator* op, int input_count,
+ Node** inputs, bool incomplete) {
+ Node* const node =
+ Node::New(zone(), NextNodeId(), op, input_count, inputs, incomplete);
+ Decorate(node);
+ return node;
+}
+
+
+Node* Graph::CloneNode(const Node* node) {
+ DCHECK_NOT_NULL(node);
+ Node* const clone = Node::Clone(zone(), NextNodeId(), node);
+ Decorate(clone);
+ return clone;
+}
+
+
+NodeId Graph::NextNodeId() {
+ NodeId const id = next_node_id_;
+ CHECK(!base::bits::UnsignedAddOverflow32(id, 1, &next_node_id_));
+ return id;
}
} // namespace compiler