| Index: runtime/vm/dart.cc
|
| diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
|
| index 4553d1b5f9e483e93de952100bcda410fe1d6e92..b4f62b99a3021dd5080d730ffb8432b9d2037b5c 100644
|
| --- a/runtime/vm/dart.cc
|
| +++ b/runtime/vm/dart.cc
|
| @@ -149,11 +149,9 @@ char* Dart::InitOnce(const uint8_t* vm_isolate_snapshot,
|
| FreeListElement::InitOnce();
|
| ForwardingCorpse::InitOnce();
|
| Api::InitOnce();
|
| + NativeSymbolResolver::InitOnce();
|
| NOT_IN_PRODUCT(CodeObservers::InitOnce());
|
| - if (FLAG_profiler) {
|
| - ThreadInterrupter::InitOnce();
|
| - Profiler::InitOnce();
|
| - }
|
| + NOT_IN_PRODUCT(Profiler::InitOnce());
|
| SemiSpace::InitOnce();
|
| NOT_IN_PRODUCT(Metric::InitOnce());
|
| StoreBuffer::InitOnce();
|
| @@ -354,14 +352,15 @@ const char* Dart::Cleanup() {
|
| UptimeMillis());
|
| }
|
|
|
| - if (FLAG_profiler) {
|
| - // Shut down profiling.
|
| - if (FLAG_trace_shutdown) {
|
| - OS::PrintErr("[+%" Pd64 "ms] SHUTDOWN: Shutting down profiling\n",
|
| - UptimeMillis());
|
| - }
|
| - Profiler::Shutdown();
|
| +#if !defined(PRODUCT)
|
| + if (FLAG_trace_shutdown) {
|
| + OS::PrintErr("[+%" Pd64 "ms] SHUTDOWN: Shutting down profiling\n",
|
| + UptimeMillis());
|
| }
|
| + Profiler::Shutdown();
|
| +#endif // !defined(PRODUCT)
|
| +
|
| + NativeSymbolResolver::ShutdownOnce();
|
|
|
| {
|
| // Set the VM isolate as current isolate when shutting down
|
|
|