Move StackGuard::InterruptRequested into StackLimitCheck.

R=yangguo@chromium.org

Review URL: https://codereview.chromium.org/1310253002

Cr-Commit-Position: refs/heads/master@{#30333}

diff --git a/src/execution.cc b/src/execution.cc
index 9a1ab3597b3db011a1fb7e95ea9b6bd8d13e846f..173de0e33feb0e9044a142c5bbb3ae89fefbb93d 100644 (file)
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -626,7 +626,7 @@ Handle<String> Execution::GetStackTraceLine(Handle<Object> recv,
 }
 
 
-void StackGuard::CheckAndHandleGCInterrupt() {
+void StackGuard::HandleGCInterrupt() {
   if (CheckAndClearInterrupt(GC_REQUEST)) {
     isolate_->heap()->HandleGCRequest();
   }

diff --git a/src/execution.h b/src/execution.h
index 551682c2eb65637864e751e555c6a5df98c9565e..2b17c0a66112dd866c512363870172bed975efe0 100644 (file)
--- a/src/execution.h
+++ b/src/execution.h
@@ -195,10 +195,7 @@ class StackGuard final {
   // If the stack guard is triggered, but it is not an actual
   // stack overflow, then handle the interruption accordingly.
   Object* HandleInterrupts();
-
-  bool InterruptRequested() { return GetCurrentStackPosition() < climit(); }
-
-  void CheckAndHandleGCInterrupt();
+  void HandleGCInterrupt();
 
  private:
   StackGuard();

diff --git a/src/isolate.h b/src/isolate.h
index 5339bcce5a0b4f656f6a85bd19f56f442c1c406b..e2187be3f9f05ee48de99971ee8aaba47366d466 100644 (file)
--- a/src/isolate.h
+++ b/src/isolate.h
@@ -1478,11 +1478,17 @@ class StackLimitCheck BASE_EMBEDDED {
   explicit StackLimitCheck(Isolate* isolate) : isolate_(isolate) { }
 
   // Use this to check for stack-overflows in C++ code.
-  inline bool HasOverflowed() const {
+  bool HasOverflowed() const {
     StackGuard* stack_guard = isolate_->stack_guard();
     return GetCurrentStackPosition() < stack_guard->real_climit();
   }
 
+  // Use this to check for interrupt request in C++ code.
+  bool InterruptRequested() {
+    StackGuard* stack_guard = isolate_->stack_guard();
+    return GetCurrentStackPosition() < stack_guard->climit();
+  }
+
   // Use this to check for stack-overflow when entering runtime from JS code.
   bool JsHasOverflowed(uintptr_t gap = 0) const;
 

diff --git a/src/json-parser.h b/src/json-parser.h
index 81c83bd1d8aad08f2d49489b79fc7111f5de4879..3ee874930411579ed88fd067237e3cd491f2ddcd 100644 (file)
--- a/src/json-parser.h
+++ b/src/json-parser.h
@@ -263,10 +263,10 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonValue() {
     return Handle<Object>::null();
   }
 
-  if (isolate_->stack_guard()->InterruptRequested()) {
+  if (stack_check.InterruptRequested()) {
     ExecutionAccess access(isolate_);
     // Avoid blocking GC in long running parser (v8:3974).
-    isolate_->stack_guard()->CheckAndHandleGCInterrupt();
+    isolate_->stack_guard()->HandleGCInterrupt();
   }
 
   if (c0_ == '"') return ParseJsonString();