[Isolates] Merge 6500:6700 from bleeding_edge to isolates.

src/arm/codegen-arm.h

 // Copyright 2010 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 269 matching lines @@
       (ZoneList<Expression*>*);
 
   static const InlineFunctionGenerator kInlineFunctionGenerators[];
 
   // Construction/Destruction
   explicit CodeGenerator(MacroAssembler* masm);
 
   // Accessors
   inline bool is_eval();
   inline Scope* scope();
+  inline StrictModeFlag strict_mode_flag();
 
   // Generating deferred code.
   void ProcessDeferred();
 
   static const int kInvalidSlotNumber = -1;
 
   int NumberOfSlot(Slot* slot);
 
   // State
   bool has_cc() const { return cc_reg_ != al; }
@@ skipping 284 matching lines @@
   friend class InlineRuntimeFunctionsTable;
   friend class LCodeGen;
 
   DISALLOW_COPY_AND_ASSIGN(CodeGenerator);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_CODEGEN_ARM_H_