Fix jump targets on ARM to merge virtual frames (really this time)....

src/codegen.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 162 matching lines @@
     ASSERT(top_ != NULL);
     return top_;
   }
 
  private:
   static CodeGenerator* top_;
   CodeGenerator* previous_;
 };
 
 
+#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64
+
 // State of used registers in a virtual frame.
 class FrameRegisterState {
  public:
   // Captures the current state of the given frame.
   explicit FrameRegisterState(VirtualFrame* frame);
 
   // Saves the state in the stack.
   void Save(MacroAssembler* masm) const;
 
   // Restores the state from the stack.
   void Restore(MacroAssembler* masm) const;
 
  private:
   // Constants indicating special actions.  They should not be multiples
   // of kPointerSize so they will not collide with valid offsets from
   // the frame pointer.
   static const int kIgnore = -1;
   static const int kPush = 1;
 
   // This flag is ored with a valid offset from the frame pointer, so
   // it should fit in the low zero bits of a valid offset.
   static const int kSyncedFlag = 2;
 
-  // C++ doesn't allow zero length arrays, so we make the array length 1 even
-  // if we don't need it.
-  static const int kRegistersArrayLength =
-      (RegisterAllocator::kNumRegisters == 0) ?
-          1 : RegisterAllocator::kNumRegisters;
-  int registers_[kRegistersArrayLength];
+  int registers_[RegisterAllocator::kNumRegisters];
 };
 
+#elif V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS
+
+
+class FrameRegisterState {
+ public:
+  inline FrameRegisterState(VirtualFrame frame) : frame_(frame) { }
+
+  inline const VirtualFrame* frame() const { return &frame_; }
+
+ private:
+  VirtualFrame frame_;
+};
+
+#else
+
+#error Unsupported target architecture.
+
+#endif
+
 
 // Helper interface to prepare to/restore after making runtime calls.
 class RuntimeCallHelper {
  public:
   virtual ~RuntimeCallHelper() {}
 
   virtual void BeforeCall(MacroAssembler* masm) const = 0;
 
   virtual void AfterCall(MacroAssembler* masm) const = 0;
 
@@ skipping 618 matching lines @@
   StringCharFromCodeGenerator char_from_code_generator_;
 
   DISALLOW_COPY_AND_ASSIGN(StringCharAtGenerator);
 };
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CODEGEN_H_