Merge up to bleeding_edge r7201 to isolates branch.

src/deoptimizer.cc

Index: src/deoptimizer.cc
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index 8c7dace7a0bf3ec22c039cac66c81e32259578de..a2c2be5e2ac44dff0236dd631afc93c91cf12031 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -936,12 +936,9 @@ LargeObjectChunk* Deoptimizer::CreateCode(BailoutType type) {
   // references. This is fine because the deoptimizer's code section
   // isn't meant to be serialized at all.
   ASSERT(!Serializer::enabled());
-  // Grab a mutex because we're changing a global flag.
-  ScopedLock lock(flag_mutex);
-  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);
@@ -950,7 +947,6 @@ LargeObjectChunk* Deoptimizer::CreateCode(BailoutType type) {
   LargeObjectChunk* chunk = LargeObjectChunk::New(desc.instr_size, EXECUTABLE);
   memcpy(chunk->GetStartAddress(), desc.buffer, desc.instr_size);
   CPU::FlushICache(chunk->GetStartAddress(), desc.instr_size);
-  FLAG_debug_code = old_debug_code;
   return chunk;
 }