Chromium Code Reviews| Index: src/frames.cc |
| diff --git a/src/frames.cc b/src/frames.cc |
| index 01c0a4960ec66036abdc6754ce4cbbeeec80eba8..f116fd2739f73f99da628f174454f25abf9e2354 100644 |
| --- a/src/frames.cc |
| +++ b/src/frames.cc |
| @@ -932,9 +932,9 @@ void OptimizedFrame::Summarize(List<FrameSummary>* frames) { |
| DCHECK(frames->length() == 0); |
| DCHECK(is_optimized()); |
| - // Delegate to JS frame in absence of inlining. |
| - // TODO(turbofan): Revisit once we support inlining. |
| - if (LookupCode()->is_turbofanned()) { |
| + // Delegate to JS frame in absence of turbofan deoptimization. |
| + // TODO(turbofan): Revisit once we support deoptimization across the board. |
| + if (LookupCode()->is_turbofanned() && !FLAG_turbo_deoptimization) { |
|
Jarin
2014/09/15 13:37:51
This is a bold move. We should try to run with run
sigurds
2014/09/16 08:39:03
Most of the errors I'm getting seem to be missing
|
| return JavaScriptFrame::Summarize(frames); |
| } |
| @@ -1059,9 +1059,9 @@ DeoptimizationInputData* OptimizedFrame::GetDeoptimizationData( |
| int OptimizedFrame::GetInlineCount() { |
| DCHECK(is_optimized()); |
| - // Delegate to JS frame in absence of inlining. |
| - // TODO(turbofan): Revisit once we support inlining. |
| - if (LookupCode()->is_turbofanned()) { |
| + // Delegate to JS frame in absence of turbofan deoptimization. |
| + // TODO(turbofan): Revisit once we support deoptimization across the board. |
| + if (LookupCode()->is_turbofanned() && !FLAG_turbo_deoptimization) { |
| return JavaScriptFrame::GetInlineCount(); |
| } |
| @@ -1083,9 +1083,9 @@ void OptimizedFrame::GetFunctions(List<JSFunction*>* functions) { |
| DCHECK(functions->length() == 0); |
| DCHECK(is_optimized()); |
| - // Delegate to JS frame in absence of inlining. |
| - // TODO(turbofan): Revisit once we support inlining. |
| - if (LookupCode()->is_turbofanned()) { |
| + // Delegate to JS frame in absence of turbofan deoptimization. |
| + // TODO(turbofan): Revisit once we support deoptimization across the board. |
| + if (LookupCode()->is_turbofanned() && !FLAG_turbo_deoptimization) { |
| return JavaScriptFrame::GetFunctions(functions); |
| } |