Do another merge using nifty new merge script (CL for that coming soon).

third_party/WebKit/JavaScriptCore/parser/Nodes.h

Index: third_party/WebKit/JavaScriptCore/parser/Nodes.h
===================================================================
--- third_party/WebKit/JavaScriptCore/parser/Nodes.h	(revision 5296)
+++ third_party/WebKit/JavaScriptCore/parser/Nodes.h	(working copy)
@@ -2078,9 +2078,9 @@
 
         int neededConstants()
         {
-            // We may need 1 more constant than the count given by the parser,
-            // because of the various uses of jsUndefined().
-            return m_numConstants + 1;
+            // We may need 2 more constants than the count given by the parser,
+            // because of the various uses of jsUndefined() and jsNull().
+            return m_numConstants + 2;
         }
 
     protected: