| Index: runtime/vm/object.cc
|
| ===================================================================
|
| --- runtime/vm/object.cc (revision 32801)
|
| +++ runtime/vm/object.cc (working copy)
|
| @@ -900,7 +900,7 @@
|
|
|
|
|
| RawError* Object::Init(Isolate* isolate) {
|
| - TIMERSCOPE(time_bootstrap);
|
| + TIMERSCOPE(isolate, time_bootstrap);
|
| ObjectStore* object_store = isolate->object_store();
|
|
|
| Class& cls = Class::Handle();
|
| @@ -1334,7 +1334,7 @@
|
|
|
|
|
| void Object::InitFromSnapshot(Isolate* isolate) {
|
| - TIMERSCOPE(time_bootstrap);
|
| + TIMERSCOPE(isolate, time_bootstrap);
|
| ObjectStore* object_store = isolate->object_store();
|
|
|
| Class& cls = Class::Handle();
|
| @@ -7294,11 +7294,12 @@
|
| }
|
|
|
| // Get the source, scan and allocate the token stream.
|
| - TimerScope timer(FLAG_compiler_stats, &CompilerStats::scanner_timer);
|
| - const String& src = String::Handle(Source());
|
| + Isolate* isolate = Isolate::Current();
|
| + TimerScope timer(FLAG_compiler_stats, &CompilerStats::scanner_timer, isolate);
|
| + const String& src = String::Handle(isolate, Source());
|
| Scanner scanner(src, private_key);
|
| - set_tokens(TokenStream::Handle(TokenStream::New(scanner.GetStream(),
|
| - private_key)));
|
| + set_tokens(TokenStream::Handle(isolate, TokenStream::New(scanner.GetStream(),
|
| + private_key)));
|
| if (FLAG_compiler_stats) {
|
| CompilerStats::src_length += src.Length();
|
| }
|
|
|