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

src/arm/virtual-frame-arm.h

Index: src/arm/virtual-frame-arm.h
===================================================================
--- src/arm/virtual-frame-arm.h	(revision 4205)
+++ src/arm/virtual-frame-arm.h	(working copy)
@@ -364,6 +364,9 @@
   // the frame.  Nip(k) is equivalent to x = Pop(), Drop(k), Push(x).
   inline void Nip(int num_dropped);
 
+  inline void SetTypeForLocalAt(int index, NumberInfo info);
+  inline void SetTypeForParamAt(int index, NumberInfo info);
+
  private:
   static const int kLocal0Offset = JavaScriptFrameConstants::kLocal0Offset;
   static const int kFunctionOffset = JavaScriptFrameConstants::kFunctionOffset;