Revert "Revert interrupt handling code changed in r21208."

src/execution.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "execution.h"
 
 #include "bootstrapper.h"
 #include "codegen.h"
 #include "deoptimizer.h"
 #include "isolate-inl.h"
@@ skipping 370 matching lines @@
 
 void StackGuard::ClearInterrupt(int flagbit) {
   ExecutionAccess access(isolate_);
   thread_local_.interrupt_flags_ &= ~flagbit;
   if (!should_postpone_interrupts(access) && !has_pending_interrupts(access)) {
     reset_limits(access);
   }
 }
 
 
+bool StackGuard::CheckAndClearInterrupt(InterruptFlag flag,
+                                        const ExecutionAccess& lock) {
+  int flagbit = 1 << flag;
+  bool result = (thread_local_.interrupt_flags_ & flagbit);
+  thread_local_.interrupt_flags_ &= ~flagbit;
+  if (!should_postpone_interrupts(lock) && !has_pending_interrupts(lock)) {
+    reset_limits(lock);
+  }
+  return result;
+}
+
+
 char* StackGuard::ArchiveStackGuard(char* to) {
   ExecutionAccess access(isolate_);
   OS::MemCopy(to, reinterpret_cast<char*>(&thread_local_), sizeof(ThreadLocal));
   ThreadLocal blank;
 
   // Set the stack limits using the old thread_local_.
   // TODO(isolates): This was the old semantics of constructing a ThreadLocal
   //                 (as the ctor called SetStackLimits, which looked at the
   //                 current thread_local_ from StackGuard)-- but is this
   //                 really what was intended?
@@ skipping 312 matching lines @@
   if (debugger.FailedToEnter()) return;
 
   // Notify the debug event listeners. Indicate auto continue if the break was
   // a debug command break.
   isolate->debugger()->OnDebugBreak(isolate->factory()->undefined_value(),
                                     debug_command_only);
 }
 
 
 Object* StackGuard::HandleInterrupts() {
-  { ExecutionAccess access(isolate_);
-    if (should_postpone_interrupts(access)) {
-      return isolate_->heap()->undefined_value();
-    }
+  ExecutionAccess access(isolate_);
+  if (should_postpone_interrupts(access)) {
+    return isolate_->heap()->undefined_value();
   }
 
-  if (CheckApiInterrupt()) {
-    ClearApiInterrupt();
+  if (CheckAndClearInterrupt(API_INTERRUPT, access)) {
     isolate_->InvokeApiInterruptCallback();
   }
 
-  if (CheckGC()) {
+  if (CheckAndClearInterrupt(GC_REQUEST, access)) {
     isolate_->heap()->CollectAllGarbage(Heap::kNoGCFlags, "GC interrupt");
-    ClearGC();
   }
 
   if (CheckDebugBreak() || CheckDebugCommand()) {
     Execution::DebugBreakHelper(isolate_);
   }
 
-  if (CheckTerminateExecution()) {
-    ClearTerminateExecution();
+  if (CheckAndClearInterrupt(TERMINATE_EXECUTION, access)) {
     return isolate_->TerminateExecution();
   }
 
-  if (CheckFullDeopt()) {
-    ClearFullDeopt();
+  if (CheckAndClearInterrupt(FULL_DEOPT, access)) {
     Deoptimizer::DeoptimizeAll(isolate_);
   }
 
-  if (CheckDeoptMarkedAllocationSites()) {
-    ClearDeoptMarkedAllocationSites();
+  if (CheckAndClearInterrupt(DEOPT_MARKED_ALLOCATION_SITES, access)) {
     isolate_->heap()->DeoptMarkedAllocationSites();
   }
 
-  if (CheckInstallCode()) {
+  if (CheckAndClearInterrupt(INSTALL_CODE, access)) {
     ASSERT(isolate_->concurrent_recompilation_enabled());
-    ClearInstallCode();
     isolate_->optimizing_compiler_thread()->InstallOptimizedFunctions();
   }
 
   isolate_->counters()->stack_interrupts()->Increment();
   isolate_->counters()->runtime_profiler_ticks()->Increment();
   isolate_->runtime_profiler()->OptimizeNow();
   return isolate_->heap()->undefined_value();
 }
 
 } }  // namespace v8::internal