Chromium Code Reviews| Index: runtime/vm/dart.cc |
| diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc |
| index aa8a162d0d62f6e57c82fe292c908190a940d74c..2b413265ea590dab5913788032067218075dcfd8 100644 |
| --- a/runtime/vm/dart.cc |
| +++ b/runtime/vm/dart.cc |
| @@ -23,20 +23,19 @@ namespace dart { |
| Isolate* Dart::vm_isolate_ = NULL; |
| DebugInfo* Dart::pprof_symbol_generator_ = NULL; |
| -bool Dart::InitOnce(int argc, const char** argv, |
| - Dart_IsolateInitCallback callback) { |
| +bool Dart::InitOnce(Dart_IsolateInitCallback callback) { |
| // TODO(iposva): Fix race condition here. |
| if (vm_isolate_ != NULL) { |
|
siva
2011/11/30 19:09:38
if (vm_isolate_ != NULL || !Flags::Initialized())
podivilov
2011/12/01 11:10:22
Done.
|
| return false; |
| } |
| OS::InitOnce(); |
| - Flags::ProcessCommandLineFlags(argc, argv); |
| VirtualMemory::InitOnce(); |
| Isolate::InitOnce(); |
| PortMap::InitOnce(); |
| // Create the VM isolate and finish the VM initialization. |
| { |
| ASSERT(vm_isolate_ == NULL); |
| + ASSERT(Flags::Initialized()); |
| vm_isolate_ = Isolate::Init(); |
| Zone zone(vm_isolate_); |
| HandleScope handle_scope(vm_isolate_); |