Index: src/arm/virtual-frame-arm.h |
=================================================================== |
--- src/arm/virtual-frame-arm.h (revision 7267) |
+++ src/arm/virtual-frame-arm.h (working copy) |
@@ -55,23 +55,26 @@ |
class SpilledScope BASE_EMBEDDED { |
public: |
explicit SpilledScope(VirtualFrame* frame) |
- : old_is_spilled_(is_spilled_) { |
+ : old_is_spilled_( |
+ Isolate::Current()->is_virtual_frame_in_spilled_scope()) { |
if (frame != NULL) { |
- if (!is_spilled_) { |
+ if (!old_is_spilled_) { |
frame->SpillAll(); |
} else { |
frame->AssertIsSpilled(); |
} |
} |
- is_spilled_ = true; |
+ Isolate::Current()->set_is_virtual_frame_in_spilled_scope(true); |
} |
~SpilledScope() { |
- is_spilled_ = old_is_spilled_; |
+ Isolate::Current()->set_is_virtual_frame_in_spilled_scope( |
+ old_is_spilled_); |
} |
- static bool is_spilled() { return is_spilled_; } |
+ static bool is_spilled() { |
+ return Isolate::Current()->is_virtual_frame_in_spilled_scope(); |
+ } |
private: |
- static bool is_spilled_; |
int old_is_spilled_; |
SpilledScope() { } |
@@ -274,7 +277,7 @@ |
// Call runtime given the number of arguments expected on (and |
// removed from) the stack. |
- void CallRuntime(Runtime::Function* f, int arg_count); |
+ void CallRuntime(const Runtime::Function* f, int arg_count); |
void CallRuntime(Runtime::FunctionId id, int arg_count); |
#ifdef ENABLE_DEBUGGER_SUPPORT |