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

third_party/WebKit/JavaScriptCore/parser/Nodes.h

 /*
  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
  *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *  Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
  *  Copyright (C) 2007 Maks Orlovich
  *  Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ skipping 2060 matching lines @@
         bool usesArguments() const { return m_features & ArgumentsFeature; }
         void setUsesArguments() { m_features |= ArgumentsFeature; }
         bool usesThis() const { return m_features & ThisFeature; }
         bool needsActivation() const { return m_features & (EvalFeature | ClosureFeature | WithFeature | CatchFeature); }
 
         VarStack& varStack() { return m_varStack; }
         FunctionStack& functionStack() { return m_functionStack; }
 
         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:
         void setSource(const SourceCode& source) { m_source = source; }
 
         VarStack m_varStack;
         FunctionStack m_functionStack;
 
     private:
         SourceCode m_source;
@@ skipping 284 matching lines @@
     };
 
     struct ClauseList {
         ClauseListNode* head;
         ClauseListNode* tail;
     };
 
 } // namespace JSC
 
 #endif // NODES_H_