| Index: runtime/vm/dart.cc
|
| ===================================================================
|
| --- runtime/vm/dart.cc (revision 15227)
|
| +++ runtime/vm/dart.cc (working copy)
|
| @@ -48,12 +48,12 @@
|
|
|
|
|
| // TODO(turnidge): We should add a corresponding Dart::Cleanup.
|
| -bool Dart::InitOnce(Dart_IsolateCreateCallback create,
|
| +const char* Dart::InitOnce(Dart_IsolateCreateCallback create,
|
| Dart_IsolateInterruptCallback interrupt,
|
| Dart_IsolateShutdownCallback shutdown) {
|
| // TODO(iposva): Fix race condition here.
|
| if (vm_isolate_ != NULL || !Flags::Initialized()) {
|
| - return false;
|
| + return "VM already initialized.";
|
| }
|
| OS::InitOnce();
|
| VirtualMemory::InitOnce();
|
| @@ -79,7 +79,9 @@
|
| CPUFeatures::InitOnce();
|
| #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
|
| // Dart VM requires at least SSE3.
|
| - if (!CPUFeatures::sse3_supported()) return false;
|
| + if (!CPUFeatures::sse3_supported()) {
|
| + return "SSE3 is required.";
|
| + }
|
| #endif
|
| PremarkingVisitor premarker(vm_isolate_);
|
| vm_isolate_->heap()->IterateOldObjects(&premarker);
|
| @@ -89,7 +91,7 @@
|
| Isolate::SetCreateCallback(create);
|
| Isolate::SetInterruptCallback(interrupt);
|
| Isolate::SetShutdownCallback(shutdown);
|
| - return true;
|
| + return NULL;
|
| }
|
|
|
|
|
|
|