Fix compilation on ARM and x64.

src/ia32/code-stubs-ia32.cc

 // Copyright 2011 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 6240 matching lines @@
   } else {
     __ ret(0);
   }
 
   __ bind(&skip_to_incremental_noncompacting);
   GenerateIncremental(masm, INCREMENTAL);
 
   __ bind(&skip_to_incremental_compacting);
   GenerateIncremental(masm, INCREMENTAL_COMPACTION);
 
-  if (!masm->isolate()->heap()->incremental_marking()->IsMarking()) {
+  // TODO(gc) ensure that GC can't happen after stub was generated by before
+  // it was added to a stub cache.
+  IncrementalMarking* marking = masm->isolate()->heap()->incremental_marking();
+  if (!marking->IsMarking() || marking->IsCompacting()) {
     ASSERT(masm->byte_at(0) == kTwoByteJumpInstruction);
     masm->set_byte_at(0, kTwoByteNopInstruction);
   }
 
-  if (!masm->isolate()->heap()->incremental_marking()->IsMarking()) {
+  if (!marking->IsMarking()) {
     ASSERT(masm->byte_at(2) == kFiveByteJumpInstruction);
     masm->set_byte_at(2, kFiveByteNopInstruction);
   }
 }
 
 
 void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) {
   regs_.Save(masm);
 
   if (remembered_set_action_ == EMIT_REMEMBERED_SET) {
@@ skipping 27 matching lines @@
   CheckNeedsToInformIncrementalMarker(
       masm,
       kReturnOnNoNeedToInformIncrementalMarker,
       mode);
   InformIncrementalMarker(masm, mode);
   regs_.Restore(masm);
   __ ret(0);
 }
 
 
-void RecordWriteStub::InformIncrementalMarker(
-    MacroAssembler* masm,
-    RecordWriteStub::Mode mode) {
+void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm, Mode mode) {
   regs_.SaveCallerSaveRegisters(masm, save_fp_regs_mode_);
   int argument_count = 3;
   __ PrepareCallCFunction(argument_count, regs_.scratch0());
   __ mov(Operand(esp, 0 * kPointerSize), regs_.object());
   if (mode == INCREMENTAL_COMPACTION) {
     __ mov(Operand(esp, 1 * kPointerSize), regs_.address());  // Slot.
   } else {
     ASSERT(mode == INCREMENTAL);
     __ mov(regs_.scratch0(), Operand(regs_.address(), 0));
     __ mov(Operand(esp, 1 * kPointerSize), regs_.scratch0());  // Value.
@@ skipping 14 matching lines @@
         ExternalReference::incremental_marking_record_write_function(
             masm->isolate()),
         argument_count);
   }
   regs_.RestoreCallerSaveRegisters(masm, save_fp_regs_mode_);
 }
 
 
 void RecordWriteStub::CheckNeedsToInformIncrementalMarker(
     MacroAssembler* masm,
-    RecordWriteStub::OnNoNeedToInformIncrementalMarker on_no_need,
-    RecordWriteStub::Mode mode) {
+    OnNoNeedToInformIncrementalMarker on_no_need,
+    Mode mode) {
   Label object_is_black, need_incremental, need_incremental_pop_object;
 
   // Let's look at the color of the object:  If it is not black we don't have
   // to inform the incremental marker.
   __ JumpIfBlack(regs_.object(),
                  regs_.scratch0(),
                  regs_.scratch1(),
                  &object_is_black,
                  Label::kNear);
 
@@ skipping 57 matching lines @@
 
   // Fall through when we need to inform the incremental marker.
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32