| OLD | NEW |
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, 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/object.h" | 5 #include "vm/object.h" |
| 6 | 6 |
| 7 #include "vm/hash_table.h" | 7 #include "vm/hash_table.h" |
| 8 #include "vm/isolate_reload.h" | 8 #include "vm/isolate_reload.h" |
| 9 #include "vm/log.h" | 9 #include "vm/log.h" |
| 10 #include "vm/resolver.h" | 10 #include "vm/resolver.h" |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 | 380 |
| 381 class EnsureFinalizedError : public ClassReasonForCancelling { | 381 class EnsureFinalizedError : public ClassReasonForCancelling { |
| 382 public: | 382 public: |
| 383 EnsureFinalizedError(const Class& from, const Class& to, const Error& error) | 383 EnsureFinalizedError(const Class& from, const Class& to, const Error& error) |
| 384 : ClassReasonForCancelling(from, to), error_(error) { } | 384 : ClassReasonForCancelling(from, to), error_(error) { } |
| 385 | 385 |
| 386 private: | 386 private: |
| 387 const Error& error_; | 387 const Error& error_; |
| 388 | 388 |
| 389 RawError* ToError() { return error_.raw(); } | 389 RawError* ToError() { return error_.raw(); } |
| 390 |
| 391 RawString* ToString() { |
| 392 return String::New(error_.ToErrorCString()); |
| 393 } |
| 390 }; | 394 }; |
| 391 | 395 |
| 392 | 396 |
| 393 class NativeFieldsConflict : public ClassReasonForCancelling { | 397 class NativeFieldsConflict : public ClassReasonForCancelling { |
| 394 public: | 398 public: |
| 395 NativeFieldsConflict(const Class& from, const Class& to) | 399 NativeFieldsConflict(const Class& from, const Class& to) |
| 396 : ClassReasonForCancelling(from, to) { } | 400 : ClassReasonForCancelling(from, to) { } |
| 397 | 401 |
| 398 private: | 402 private: |
| 399 RawString* ToString() { | 403 RawString* ToString() { |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 } | 695 } |
| 692 ClearAndSetStaticTarget(new_target); | 696 ClearAndSetStaticTarget(new_target); |
| 693 } else { | 697 } else { |
| 694 ClearWithSentinel(); | 698 ClearWithSentinel(); |
| 695 } | 699 } |
| 696 } | 700 } |
| 697 | 701 |
| 698 #endif // !PRODUCT | 702 #endif // !PRODUCT |
| 699 | 703 |
| 700 } // namespace dart. | 704 } // namespace dart. |
| OLD | NEW |