Merge bleeding_edge from version 2.1.3 up to revision 4205...

src/mips/virtual-frame-mips.h

Index: src/mips/virtual-frame-mips.h
===================================================================
--- src/mips/virtual-frame-mips.h	(revision 4205)
+++ src/mips/virtual-frame-mips.h	(working copy)
@@ -71,7 +71,7 @@
 
   // Create a duplicate of an existing valid frame element.
   FrameElement CopyElementAt(int index,
-                             NumberInfo::Type info = NumberInfo::kUnknown);
+                             NumberInfo info = NumberInfo::Unknown());
 
   // The number of elements on the virtual frame.
   int element_count() { return elements_.length(); }
@@ -367,7 +367,7 @@
   void EmitMultiPushReversed(RegList regs);  // higher first
 
   // Push an element on the virtual frame.
-  inline void Push(Register reg, NumberInfo::Type info = NumberInfo::kUnknown);
+  inline void Push(Register reg, NumberInfo info = NumberInfo::Unknown());
   inline void Push(Handle<Object> value);
   inline void Push(Smi* value);
 
@@ -391,6 +391,8 @@
   // 'a' registers are arguments register a0 to a3.
   void EmitArgumentSlots(RegList reglist);
 
+  inline void SetTypeForLocalAt(int index, NumberInfo info);
+
  private:
   static const int kLocal0Offset = JavaScriptFrameConstants::kLocal0Offset;
   static const int kFunctionOffset = JavaScriptFrameConstants::kFunctionOffset;