[Isolates] Merge 7051:7083 from bleeding_edge to isolates.

src/x64/lithium-codegen-x64.h

Index: src/x64/lithium-codegen-x64.h
===================================================================
--- src/x64/lithium-codegen-x64.h	(revision 7083)
+++ src/x64/lithium-codegen-x64.h	(working copy)
@@ -56,7 +56,7 @@
         jump_table_(4),
         deoptimization_literals_(8),
         inlined_function_count_(0),
-        scope_(chunk->graph()->info()->scope()),
+        scope_(info->scope()),
         status_(UNUSED),
         deferred_(8),
         osr_pc_offset_(-1),
@@ -67,6 +67,7 @@
   // Simple accessors.
   MacroAssembler* masm() const { return masm_; }
   Isolate* isolate() const { return info_->isolate(); }
+  CompilationInfo* info() const { return info_; }
 
   // Support for converting LOperands to assembler types.
   Register ToRegister(LOperand* op) const;
@@ -120,7 +121,7 @@
   bool is_aborted() const { return status_ == ABORTED; }
 
   int strict_mode_flag() const {
-    return info_->is_strict() ? kStrictMode : kNonStrictMode;
+    return info()->is_strict() ? kStrictMode : kNonStrictMode;
   }
 
   LChunk* chunk() const { return chunk_; }