| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #include "vm/service_isolate.h" | 5 #include "vm/service_isolate.h" |
| 6 | 6 |
| 7 #include "vm/compiler.h" | 7 #include "vm/compiler.h" |
| 8 #include "vm/dart_api_impl.h" | 8 #include "vm/dart_api_impl.h" |
| 9 #include "vm/dart_entry.h" | 9 #include "vm/dart_entry.h" |
| 10 #include "vm/isolate.h" | 10 #include "vm/isolate.h" |
| (...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 String::FromUTF8(reinterpret_cast<const uint8_t*>(resource), r)); | 532 String::FromUTF8(reinterpret_cast<const uint8_t*>(resource), r)); |
| 533 ASSERT(!source_str.IsNull()); | 533 ASSERT(!source_str.IsNull()); |
| 534 const Script& script = Script::Handle( | 534 const Script& script = Script::Handle( |
| 535 isolate, Script::New(url_str, source_str, RawScript::kLibraryTag)); | 535 isolate, Script::New(url_str, source_str, RawScript::kLibraryTag)); |
| 536 | 536 |
| 537 // Compile script. | 537 // Compile script. |
| 538 Dart_EnterScope(); // Need to enter scope for tag handler. | 538 Dart_EnterScope(); // Need to enter scope for tag handler. |
| 539 library.SetLoadInProgress(); | 539 library.SetLoadInProgress(); |
| 540 const Error& error = Error::Handle(isolate, | 540 const Error& error = Error::Handle(isolate, |
| 541 Compiler::Compile(library, script)); | 541 Compiler::Compile(library, script)); |
| 542 if (!error.IsNull()) { |
| 543 OS::PrintErr("vm-service: Isolate creation error: %s\n", |
| 544 error.ToErrorCString()); |
| 545 } |
| 542 ASSERT(error.IsNull()); | 546 ASSERT(error.IsNull()); |
| 543 Dart_Handle result = Dart_FinalizeLoading(false); | 547 Dart_Handle result = Dart_FinalizeLoading(false); |
| 544 ASSERT(!Dart_IsError(result)); | 548 ASSERT(!Dart_IsError(result)); |
| 545 Dart_ExitScope(); | 549 Dart_ExitScope(); |
| 546 | 550 |
| 547 // Uninstall our library tag handler. | 551 // Uninstall our library tag handler. |
| 548 isolate->set_library_tag_handler(NULL); | 552 isolate->set_library_tag_handler(NULL); |
| 549 } | 553 } |
| 550 | 554 |
| 551 | 555 |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 return result; | 775 return result; |
| 772 } | 776 } |
| 773 Dart_Handle source = GetSource(url_string); | 777 Dart_Handle source = GetSource(url_string); |
| 774 if (Dart_IsError(source)) { | 778 if (Dart_IsError(source)) { |
| 775 return source; | 779 return source; |
| 776 } | 780 } |
| 777 return Dart_LoadSource(library, url, source, 0, 0); | 781 return Dart_LoadSource(library, url, source, 0, 0); |
| 778 } | 782 } |
| 779 | 783 |
| 780 } // namespace dart | 784 } // namespace dart |
| OLD | NEW |