| Index: src/x64/virtual-frame-x64.h
|
| ===================================================================
|
| --- src/x64/virtual-frame-x64.h (revision 7267)
|
| +++ src/x64/virtual-frame-x64.h (working copy)
|
| @@ -67,7 +67,9 @@
|
| private:
|
| bool previous_state_;
|
|
|
| - CodeGenerator* cgen() { return CodeGeneratorScope::Current(); }
|
| + CodeGenerator* cgen() {
|
| + return CodeGeneratorScope::Current(Isolate::Current());
|
| + }
|
| };
|
|
|
| // An illegal index into the virtual frame.
|
| @@ -79,7 +81,10 @@
|
| // Construct a virtual frame as a clone of an existing one.
|
| explicit inline VirtualFrame(VirtualFrame* original);
|
|
|
| - CodeGenerator* cgen() { return CodeGeneratorScope::Current(); }
|
| + CodeGenerator* cgen() {
|
| + return CodeGeneratorScope::Current(Isolate::Current());
|
| + }
|
| +
|
| MacroAssembler* masm() { return cgen()->masm(); }
|
|
|
| // Create a duplicate of an existing valid frame element.
|
| @@ -315,7 +320,7 @@
|
|
|
| // Call runtime given the number of arguments expected on (and
|
| // removed from) the stack.
|
| - Result CallRuntime(Runtime::Function* f, int arg_count);
|
| + Result CallRuntime(const Runtime::Function* f, int arg_count);
|
| Result CallRuntime(Runtime::FunctionId id, int arg_count);
|
|
|
| #ifdef ENABLE_DEBUGGER_SUPPORT
|
| @@ -342,7 +347,6 @@
|
| StrictModeFlag strict_mode);
|
|
|
| // Call keyed store IC. Value, key, and receiver are found on top
|
| - // of the frame. All three are dropped.
|
| Result CallKeyedStoreIC(StrictModeFlag strict_mode);
|
|
|
| // Call call IC. Function name, arguments, and receiver are found on top
|
|
|