[Arguments] Merge (7442,7496] from bleeding_edge.

src/heap.h

Index: src/heap.h
diff --git a/src/heap.h b/src/heap.h
index 40e14d24bd4822dd41f81093c6f7e76b425cf6d8..9414475ee4684a6dbcf18c75c8806f8aa4fd318c 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -155,6 +155,7 @@ inline Heap* _inline_get_heap_();
   V(name_symbol, "name")                                                 \
   V(number_symbol, "number")                                             \
   V(Number_symbol, "Number")                                             \
+  V(nan_symbol, "NaN")                                                   \
   V(RegExp_symbol, "RegExp")                                             \
   V(source_symbol, "source")                                             \
   V(global_symbol, "global")                                             \
@@ -1451,6 +1452,8 @@ class Heap {
   // Allocate empty fixed array.
   MUST_USE_RESULT MaybeObject* AllocateEmptyFixedArray();
 
+  void SwitchScavengingVisitorsTableIfProfilingWasEnabled();
+
   // Performs a minor collection in new generation.
   void Scavenge();