Remove the platform specific jump target files by making them have the...

src/jump-target-ia32.cc

Index: src/jump-target-ia32.cc
===================================================================
--- src/jump-target-ia32.cc	(revision 715)
+++ src/jump-target-ia32.cc	(working copy)
@@ -60,12 +60,6 @@
 }
 
 
-bool JumpTarget::IsActualFunctionReturn() {
-  return (this == &code_generator_->function_return_ &&
-          !code_generator_->function_return_is_shadowed_);
-}
-
-
 void JumpTarget::Jump() {
   // Precondition: there is a current frame.  There may or may not be an
   // expected frame at the label.
@@ -80,11 +74,15 @@
     code_generator_->set_frame(NULL);
     // The frame at the actual function return will always have height
     // zero.
-    if (IsActualFunctionReturn()) expected_frame_->height_ = 0;
+    if (code_generator_->IsActualFunctionReturn(this)) {
+      expected_frame_->height_ = 0;
+    }
   } else {
     // No code needs to be emitted to merge to the expected frame at the
     // actual function return.
-    if (!IsActualFunctionReturn()) current_frame->MergeTo(expected_frame_);
+    if (!code_generator_->IsActualFunctionReturn(this)) {
+      current_frame->MergeTo(expected_frame_);
+    }
     code_generator_->delete_frame();
   }
 
@@ -107,11 +105,15 @@
     expected_frame_ = new VirtualFrame(current_frame);
     // The frame at the actual function return will always have height
     // zero.
-    if (IsActualFunctionReturn()) expected_frame_->height_ = 0;
+    if (code_generator_->IsActualFunctionReturn(this)) {
+      expected_frame_->height_ = 0;
+    }
   } else {
     // No code needs to be emitted to merge to the expected frame at the
     // actual function return.
-    if (!IsActualFunctionReturn()) current_frame->MergeTo(expected_frame_);
+    if (!code_generator_->IsActualFunctionReturn(this)) {
+      current_frame->MergeTo(expected_frame_);
+    }
   }
 
   __ j(cc, &label_, hint);
@@ -125,7 +127,7 @@
   // at the label.
   ASSERT(code_generator_ != NULL);
   ASSERT(masm_ != NULL);
-  ASSERT(!IsActualFunctionReturn());
+  ASSERT(!code_generator_->IsActualFunctionReturn(this));
 
   VirtualFrame* current_frame = code_generator_->frame();
   ASSERT(current_frame != NULL);
@@ -159,13 +161,17 @@
     expected_frame_ = new VirtualFrame(current_frame);
     // The frame at the actual function return will always have height
     // zero.
-    if (IsActualFunctionReturn()) expected_frame_->height_ = 0;
+    if (code_generator_->IsActualFunctionReturn(this)) {
+      expected_frame_->height_ = 0;
+    }
   } else if (current_frame == NULL) {
     code_generator_->set_frame(new VirtualFrame(expected_frame_));
   } else {
     // No code needs to be emitted to merge to the expected frame at the
     // actual function return.
-    if (!IsActualFunctionReturn()) current_frame->MergeTo(expected_frame_);
+    if (!code_generator_->IsActualFunctionReturn(this)) {
+      current_frame->MergeTo(expected_frame_);
+    }
   }
 
   __ bind(&label_);