Fix compiler stats timer code

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 210 matching lines @@
   if (position < token_index_ && position != 0) {
     CompilerStats::num_tokens_rewind += (token_index_ - position);
   }
   token_index_ = position;
   token_kind_ = Token::kILLEGAL;
 }
 
 
 void Parser::ParseCompilationUnit(const Library& library,
                                   const Script& script) {
+  TimerScope timer(FLAG_compiler_stats, &CompilerStats::parser_timer);
   Parser parser(script, library);
-  if (FLAG_compiler_stats) {
-    CompilerStats::parser_timer.Start();
-  }
   parser.ParseTopLevel();
   if (FLAG_compiler_stats) {
-    CompilerStats::parser_timer.Stop();
     CompilerStats::num_tokens_total += parser.tokens_.Length();
   }
 }
 
 
 Token::Kind Parser::CurrentToken() {
   if (token_kind_ == Token::kILLEGAL) {
     token_kind_ = tokens_.KindAt(token_index_);
     if (token_kind_ == Token::kERROR) {
       ErrorMsg(token_index_, CurrentLiteral()->ToCString());
@@ skipping 301 matching lines @@
   } else if ((seq->length()) == 1 &&
              (seq->NodeAt(seq->length() - 1)->IsSequenceNode())) {
     return HasReturnNode(seq->NodeAt(seq->length() - 1)->AsSequenceNode());
   } else {
     return seq->NodeAt(seq->length() - 1)->IsReturnNode();
   }
 }
 
 
 void Parser::ParseFunction(ParsedFunction* parsed_function) {
+  TimerScope timer(FLAG_compiler_stats, &CompilerStats::parser_timer);
   Isolate* isolate = Isolate::Current();
   // Compilation can be nested, preserve the ast node id.
   const int prev_ast_node_id = isolate->ast_node_id();
   isolate->set_ast_node_id(0);
   ASSERT(parsed_function != NULL);
   const Function& func = parsed_function->function();
   const Class& cls = Class::Handle(isolate, func.owner());
   const Script& script = Script::Handle(isolate, cls.script());
   Parser parser(script, func, func.token_index());
-  if (FLAG_compiler_stats) {
-    CompilerStats::parser_timer.Start();
-  }
   SequenceNode* node_sequence = NULL;
   Array& default_parameter_values = Array::Handle(isolate, Array::null());
   switch (func.kind()) {
     case RawFunction::kFunction:
     case RawFunction::kClosureFunction:
     case RawFunction::kGetterFunction:
     case RawFunction::kSetterFunction:
     case RawFunction::kConstructor:
       node_sequence = parser.ParseFunc(func, default_parameter_values);
       break;
@@ skipping 28 matching lines @@
         parser.LookupReceiver(node_sequence->scope(),
                               kTestOnly);
     if (!parser.current_function().IsLocalFunction() ||
         ((receiver != NULL) && receiver->is_captured())) {
       parsed_function->set_instantiator(
           new LoadLocalNode(node_sequence->token_index(), *receiver));
     }
   }
 
   parsed_function->set_default_parameter_values(default_parameter_values);
-  if (FLAG_compiler_stats) {
-    CompilerStats::parser_timer.Stop();
-  }
   isolate->set_ast_node_id(prev_ast_node_id);
 }
 
 
 SequenceNode* Parser::ParseStaticConstGetter(const Function& func) {
   ParamList params;
   ASSERT(func.num_fixed_parameters() == 0);  // static.
   ASSERT(func.num_optional_parameters() == 0);
   ASSERT(AbstractType::Handle(func.result_type()).IsResolved());
 
@@ skipping 7126 matching lines @@
 }
 
 
 void Parser::SkipNestedExpr() {
   const bool saved_mode = SetAllowFunctionLiterals(true);
   SkipExpr();
   SetAllowFunctionLiterals(saved_mode);
 }
 
 }  // namespace dart