Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch.

src/deoptimizer.cc

Index: src/deoptimizer.cc
===================================================================
--- src/deoptimizer.cc	(revision 7180)
+++ src/deoptimizer.cc	(working copy)
@@ -926,10 +926,9 @@
   // references. This is fine because the deoptimizer's code section
   // isn't meant to be serialized at all.
   ASSERT(!Serializer::enabled());
-  bool old_debug_code = FLAG_debug_code;
-  FLAG_debug_code = false;
 
   MacroAssembler masm(NULL, 16 * KB);
+  masm.set_emit_debug_code(false);
   GenerateDeoptimizationEntries(&masm, kNumberOfEntries, type);
   CodeDesc desc;
   masm.GetCode(&desc);
@@ -939,7 +938,6 @@
       MemoryAllocator::AllocateChunk(desc.instr_size, EXECUTABLE, NULL);
   memcpy(chunk->body(), desc.buffer, desc.instr_size);
   CPU::FlushICache(chunk->body(), desc.instr_size);
-  FLAG_debug_code = old_debug_code;
   return chunk;
 }