Merge (7265, 7271] from bleeding_edge to experimental/gc branch....

src/arm/codegen-arm.h

Index: src/arm/codegen-arm.h
===================================================================
--- src/arm/codegen-arm.h	(revision 7563)
+++ src/arm/codegen-arm.h	(working copy)
@@ -271,8 +271,8 @@
   static const int kInlinedKeyedStoreInstructionsAfterPatch = 8;
   static int GetInlinedNamedStoreInstructionsAfterPatch() {
 #ifdef ENABLE_CARDMARKING_WRITE_BARRIER
-    ASSERT(inlined_write_barrier_size_ != -1);
-    return inlined_write_barrier_size_ + 4;
+    ASSERT(Isolate::Current()->inlined_write_barrier_size_ != -1);
+    return Isolate::Current()->inlined_write_barrier_size_ + 4;
 #else
     return 4;
 #endif
@@ -580,15 +580,14 @@
   // to some unlinking code).
   bool function_return_is_shadowed_;
 
-  // Size of inlined write barriers generated by EmitNamedStore.
-  static int inlined_write_barrier_size_;
-
   friend class VirtualFrame;
+  friend class Isolate;
   friend class JumpTarget;
   friend class Reference;
   friend class FastCodeGenerator;
   friend class FullCodeGenerator;
   friend class FullCodeGenSyntaxChecker;
+  friend class InlineRuntimeFunctionsTable;
   friend class LCodeGen;
 
   DISALLOW_COPY_AND_ASSIGN(CodeGenerator);