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

src/jump-target-light.cc

 // Copyright 2010 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 16 matching lines @@
 
 #include "v8.h"
 
 #include "codegen-inl.h"
 #include "jump-target-inl.h"
 
 namespace v8 {
 namespace internal {
 
 
-FrameRegisterState::FrameRegisterState(VirtualFrame* frame) {
-  // Nothing to do when register allocation is not supported.
-  ASSERT(RegisterAllocator::kNumRegisters == 0);
-}
-
-
 DeferredCode::DeferredCode()
     : masm_(CodeGeneratorScope::Current()->masm()),
       statement_position_(masm_->current_statement_position()),
       position_(masm_->current_position()),
-      frame_state_(CodeGeneratorScope::Current()->frame()) {
+      frame_state_(*CodeGeneratorScope::Current()->frame()) {
   ASSERT(statement_position_ != RelocInfo::kNoPosition);
   ASSERT(position_ != RelocInfo::kNoPosition);
 
   CodeGeneratorScope::Current()->AddDeferred(this);
 
 #ifdef DEBUG
   comment_ = "";
-  CodeGeneratorScope::Current()->frame()->AssertIsSpilled();
 #endif
 }
 
 
 // -------------------------------------------------------------------------
 // BreakTarget implementation.
 
 
 void BreakTarget::SetExpectedHeight() {
   expected_height_ = cgen()->frame()->height();
@@ skipping 42 matching lines @@
   if (cgen()->has_valid_frame()) {
     int count = cgen()->frame()->height() - expected_height_;
     if (count > 0) {
       cgen()->frame()->Drop(count);
     }
   }
   DoBind();
 }
 
 } }  // namespace v8::internal