| OLD | NEW |
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, 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/class_finalizer.h" | 5 #include "vm/class_finalizer.h" |
| 6 | 6 |
| 7 #include "vm/flags.h" | 7 #include "vm/flags.h" |
| 8 #include "vm/heap.h" | 8 #include "vm/heap.h" |
| 9 #include "vm/isolate.h" | 9 #include "vm/isolate.h" |
| 10 #include "vm/longjump.h" | 10 #include "vm/longjump.h" |
| (...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 699 isolate->set_long_jump_base(base); | 699 isolate->set_long_jump_base(base); |
| 700 *errmsg = String::null(); | 700 *errmsg = String::null(); |
| 701 return canonical_type.raw(); | 701 return canonical_type.raw(); |
| 702 } else { | 702 } else { |
| 703 // Error occured: Get the error message. | 703 // Error occured: Get the error message. |
| 704 isolate->set_long_jump_base(base); | 704 isolate->set_long_jump_base(base); |
| 705 *errmsg = isolate->object_store()->sticky_error(); | 705 *errmsg = isolate->object_store()->sticky_error(); |
| 706 return type.raw(); | 706 return type.raw(); |
| 707 } | 707 } |
| 708 UNREACHABLE(); | 708 UNREACHABLE(); |
| 709 return Type::null(); | 709 return NULL; |
| 710 } | 710 } |
| 711 | 711 |
| 712 | 712 |
| 713 void ClassFinalizer::ResolveAndFinalizeSignature(const Class& cls, | 713 void ClassFinalizer::ResolveAndFinalizeSignature(const Class& cls, |
| 714 const Function& function) { | 714 const Function& function) { |
| 715 // Resolve result type. | 715 // Resolve result type. |
| 716 Type& type = Type::Handle(function.result_type()); | 716 Type& type = Type::Handle(function.result_type()); |
| 717 if (!type.IsResolved()) { | 717 if (!type.IsResolved()) { |
| 718 if (function.IsFactory()) { | 718 if (function.IsFactory()) { |
| 719 // The signature class of the factory for a generic class holds the type | 719 // The signature class of the factory for a generic class holds the type |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1306 va_end(args); | 1306 va_end(args); |
| 1307 if (FLAG_warning_as_error) { | 1307 if (FLAG_warning_as_error) { |
| 1308 Isolate::Current()->long_jump_base()->Jump(1, message_buffer); | 1308 Isolate::Current()->long_jump_base()->Jump(1, message_buffer); |
| 1309 UNREACHABLE(); | 1309 UNREACHABLE(); |
| 1310 } else { | 1310 } else { |
| 1311 OS::Print(message_buffer); | 1311 OS::Print(message_buffer); |
| 1312 } | 1312 } |
| 1313 } | 1313 } |
| 1314 | 1314 |
| 1315 } // namespace dart | 1315 } // namespace dart |
| OLD | NEW |