Merge bleeding_edge 17696:18016.

src/execution.cc

Index: src/execution.cc
diff --git a/src/execution.cc b/src/execution.cc
index 979641a9de53c1cd7ebfce9be9bf069699b0fe9f..32c616faf43b6842a856c92d1db515284ff9b643 100644
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -814,8 +814,6 @@ static Object* RuntimePreempt(Isolate* isolate) {
   // Clear the preempt request flag.
   isolate->stack_guard()->Continue(PREEMPT);
 
-  ContextSwitcher::PreemptionReceived();
-
 #ifdef ENABLE_DEBUGGER_SUPPORT
   if (isolate->debug()->InDebugger()) {
     // If currently in the debugger don't do any actual preemption but record
@@ -951,7 +949,7 @@ MaybeObject* Execution::HandleStackGuardInterrupt(Isolate* isolate) {
     Deoptimizer::DeoptimizeAll(isolate);
   }
   if (stack_guard->IsInstallCodeRequest()) {
-    ASSERT(FLAG_concurrent_recompilation);
+    ASSERT(isolate->concurrent_recompilation_enabled());
     stack_guard->Continue(INSTALL_CODE);
     isolate->optimizing_compiler_thread()->InstallOptimizedFunctions();
   }