[turbofan] Enable deoptimization for non-asm.js TurboFan code.

src/runtime/runtime-debug.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 "src/v8.h"
 
 #include "src/accessors.h"
 #include "src/arguments.h"
 #include "src/compiler.h"
 #include "src/debug.h"
@@ skipping 458 matching lines @@
  public:
   FrameInspector(JavaScriptFrame* frame, int inlined_jsframe_index,
                  Isolate* isolate)
       : frame_(frame), deoptimized_frame_(NULL), isolate_(isolate) {
     has_adapted_arguments_ = frame_->has_adapted_arguments();
     is_bottommost_ = inlined_jsframe_index == 0;
     is_optimized_ = frame_->is_optimized();
     // Calculate the deoptimized frame.
     if (frame->is_optimized()) {
       // TODO(turbofan): Revisit once we support deoptimization.
-      if (frame->LookupCode()->is_turbofanned() && !FLAG_turbo_deoptimization) {
+      if (frame->LookupCode()->is_turbofanned() &&
+          frame->function()->shared()->asm_function() &&
+          !FLAG_turbo_asm_deoptimization) {
         is_optimized_ = false;
         return;
       }
 
       deoptimized_frame_ = Deoptimizer::DebuggerInspectableFrame(
           frame, inlined_jsframe_index, isolate);
     }
   }
 
   ~FrameInspector() {
@@ skipping 11 matching lines @@
   Object* GetFunction() {
     return is_optimized_ ? deoptimized_frame_->GetFunction()
                          : frame_->function();
   }
   Object* GetParameter(int index) {
     return is_optimized_ ? deoptimized_frame_->GetParameter(index)
                          : frame_->GetParameter(index);
   }
   Object* GetExpression(int index) {
     // TODO(turbofan): Revisit once we support deoptimization.
-    if (frame_->LookupCode()->is_turbofanned() && !FLAG_turbo_deoptimization) {
+    if (frame_->LookupCode()->is_turbofanned() &&
+        frame_->function()->shared()->asm_function() &&
+        !FLAG_turbo_asm_deoptimization) {
       return isolate_->heap()->undefined_value();
     }
     return is_optimized_ ? deoptimized_frame_->GetExpression(index)
                          : frame_->GetExpression(index);
   }
   int GetSourcePosition() {
     return is_optimized_ ? deoptimized_frame_->GetSourcePosition()
                          : frame_->LookupCode()->SourcePosition(frame_->pc());
   }
   bool IsConstructor() {
@@ skipping 2685 matching lines @@
   return Smi::FromInt(isolate->debug()->is_active());
 }
 
 
 RUNTIME_FUNCTION(Runtime_DebugBreakInOptimizedCode) {
   UNIMPLEMENTED();
   return NULL;
 }
 }  // namespace internal
 }  // namespace v8