Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/compiler/escape-analysis-reducer.h b/src/compiler/escape-analysis-reducer.h
index 1c0da16..12487b1 100644
--- a/src/compiler/escape-analysis-reducer.h
+++ b/src/compiler/escape-analysis-reducer.h
@@ -29,6 +29,10 @@
EscapeAnalysis* escape_analysis, Zone* zone);
Reduction Reduce(Node* node) final;
+ void SetExistsVirtualAllocate(bool exists) {
+ exists_virtual_allocate_ = exists;
+ }
+ void VerifyReplacement() const;
private:
Reduction ReduceLoad(Node* node);
@@ -38,9 +42,9 @@
Reduction ReduceReferenceEqual(Node* node);
Reduction ReduceObjectIsSmi(Node* node);
Reduction ReduceFrameStateUses(Node* node);
- Node* ReduceFrameState(Node* node, Node* effect, bool multiple_users);
- Node* ReduceStateValueInputs(Node* node, Node* effect, bool multiple_users);
+ Node* ReduceDeoptState(Node* node, Node* effect, bool multiple_users);
Node* ReduceStateValueInput(Node* node, int node_index, Node* effect,
+ bool node_multiused, bool already_cloned,
bool multiple_users);
JSGraph* jsgraph() const { return jsgraph_; }
@@ -51,7 +55,10 @@
JSGraph* const jsgraph_;
EscapeAnalysis* escape_analysis_;
Zone* const zone_;
- BitVector visited_;
+ // _visited marks nodes we already processed (allocs, loads, stores)
+ // and nodes that do not need a visit from ReduceDeoptState etc.
+ BitVector fully_reduced_;
+ bool exists_virtual_allocate_;
DISALLOW_COPY_AND_ASSIGN(EscapeAnalysisReducer);
};