Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/compiler/js-graph.h b/src/compiler/js-graph.h
index e772da8..fe5545a 100644
--- a/src/compiler/js-graph.h
+++ b/src/compiler/js-graph.h
@@ -41,8 +41,10 @@
// Canonicalized global constants.
Node* AllocateInNewSpaceStubConstant();
Node* AllocateInOldSpaceStubConstant();
+ Node* ToNumberBuiltinConstant();
Node* CEntryStubConstant(int result_size);
Node* EmptyFixedArrayConstant();
+ Node* EmptyLiteralsArrayConstant();
Node* HeapNumberMapConstant();
Node* OptimizedOutConstant();
Node* StaleRegisterConstant();
@@ -123,9 +125,9 @@
// stubs and runtime functions that do not require a context.
Node* NoContextConstant() { return ZeroConstant(); }
- // Creates an empty frame states for cases where we know that a function
- // cannot deopt.
- Node* EmptyFrameState();
+ // Creates an empty StateValues node, used when we don't have any concrete
+ // values for a certain part of the frame state.
+ Node* EmptyStateValues();
// Create a control node that serves as dependency for dead nodes.
Node* Dead();
@@ -145,8 +147,10 @@
enum CachedNode {
kAllocateInNewSpaceStubConstant,
kAllocateInOldSpaceStubConstant,
+ kToNumberBuiltinConstant,
kCEntryStubConstant,
kEmptyFixedArrayConstant,
+ kEmptyLiteralsArrayConstant,
kHeapNumberMapConstant,
kOptimizedOutConstant,
kStaleRegisterConstant,
@@ -158,7 +162,7 @@
kZeroConstant,
kOneConstant,
kNaNConstant,
- kEmptyFrameState,
+ kEmptyStateValues,
kDead,
kNumCachedNodes // Must remain last.
};