Chromium Code Reviews| Index: src/compiler.cc |
| diff --git a/src/compiler.cc b/src/compiler.cc |
| index 0460da1d089c6c79478bb6b64782a6dbfdc082fa..19f705450d30eec24207870381451a5f527a21ec 100644 |
| --- a/src/compiler.cc |
| +++ b/src/compiler.cc |
| @@ -362,7 +362,7 @@ OptimizingCompiler::Status OptimizingCompiler::CreateGraph() { |
| } |
| // Take --hydrogen-filter into account. |
| - if (!info()->closure()->PassesHydrogenFilter()) { |
| + if (!info()->closure()->PassesFilter(FLAG_hydrogen_filter)) { |
| info()->AbortOptimization(); |
| return SetLastStatus(BAILED_OUT); |
| } |
| @@ -1258,9 +1258,10 @@ CompilationPhase::~CompilationPhase() { |
| bool CompilationPhase::ShouldProduceTraceOutput() const { |
| // Trace if the appropriate trace flag is set and the phase name's first |
| // character is in the FLAG_trace_phase command line parameter. |
| - bool tracing_on = info()->IsStub() ? |
| - FLAG_trace_hydrogen_stubs : |
| - FLAG_trace_hydrogen; |
| + bool tracing_on = info()->IsStub() |
| + ? FLAG_trace_hydrogen_stubs |
| + : (FLAG_trace_hydrogen && |
| + info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter)); |
|
Michael Starzinger
2013/08/26 18:00:00
This breaks --trace-hydrogen in debug mode with --
|
| return (tracing_on && |
| OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL); |
| } |