Revert r32930 (Add more timing information in the VM to track time...)

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 882 matching lines @@
   ASSERT(public_class_name.Length() > 0);
   ASSERT(public_class_name.CharAt(0) == '_');
   String& str = String::Handle();
   str = lib.PrivateName(public_class_name);
   cls.set_name(str);
   lib.AddClass(cls);
 }
 
 
 RawError* Object::Init(Isolate* isolate) {
-  TIMERSCOPE(isolate, time_bootstrap);
+  TIMERSCOPE(time_bootstrap);
   ObjectStore* object_store = isolate->object_store();
 
   Class& cls = Class::Handle();
   Type& type = Type::Handle();
   Array& array = Array::Handle();
   Library& lib = Library::Handle();
 
   // All RawArray fields will be initialized to an empty array, therefore
   // initialize array class first.
   cls = Class::New<Array>();
@@ skipping 413 matching lines @@
   Intrinsifier::InitializeState();
 
   // Set up recognized state of all functions (core, math and typed data).
   MethodRecognizer::InitializeState();
 
   return Error::null();
 }
 
 
 void Object::InitFromSnapshot(Isolate* isolate) {
-  TIMERSCOPE(isolate, time_bootstrap);
+  TIMERSCOPE(time_bootstrap);
   ObjectStore* object_store = isolate->object_store();
 
   Class& cls = Class::Handle();
 
   // Set up empty classes in the object store, these will get
   // initialized correctly when we read from the snapshot.
   // This is done to allow bootstrapping of reading classes from the snapshot.
   cls = Class::New<Instance>(kInstanceCid);
   object_store->set_object_class(cls);
 
@@ skipping 5941 matching lines @@
 
 
 void Script::Tokenize(const String& private_key) const {
   const TokenStream& tkns = TokenStream::Handle(tokens());
   if (!tkns.IsNull()) {
     // Already tokenized.
     return;
   }
 
   // Get the source, scan and allocate the token stream.
-  Isolate* isolate = Isolate::Current();
-  TimerScope timer(FLAG_compiler_stats, &CompilerStats::scanner_timer, isolate);
-  const String& src = String::Handle(isolate, Source());
+  TimerScope timer(FLAG_compiler_stats, &CompilerStats::scanner_timer);
+  const String& src = String::Handle(Source());
   Scanner scanner(src, private_key);
-  set_tokens(TokenStream::Handle(isolate, TokenStream::New(scanner.GetStream(),
-                                                           private_key)));
+  set_tokens(TokenStream::Handle(TokenStream::New(scanner.GetStream(),
+                                                  private_key)));
   if (FLAG_compiler_stats) {
     CompilerStats::src_length += src.Length();
   }
 }
 
 
 void Script::SetLocationOffset(intptr_t line_offset,
                                intptr_t col_offset) const {
   ASSERT(line_offset >= 0);
   ASSERT(col_offset >= 0);
@@ skipping 10142 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart