| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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/bigint_operations.h" | 5 #include "vm/bigint_operations.h" |
| 6 #include "vm/dart_api_message.h" | 6 #include "vm/dart_api_message.h" |
| 7 #include "vm/object.h" | 7 #include "vm/object.h" |
| 8 #include "vm/snapshot_ids.h" | 8 #include "vm/snapshot_ids.h" |
| 9 #include "vm/symbols.h" | 9 #include "vm/symbols.h" |
| 10 #include "vm/unicode.h" | 10 #include "vm/unicode.h" |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 Dart_CObject_kString); | 480 Dart_CObject_kString); |
| 481 return object; | 481 return object; |
| 482 } | 482 } |
| 483 case kTypeArgumentsCid: { | 483 case kTypeArgumentsCid: { |
| 484 // TODO(sjesse): Remove this when message serialization format is | 484 // TODO(sjesse): Remove this when message serialization format is |
| 485 // updated (currently length is leaked). | 485 // updated (currently length is leaked). |
| 486 Dart_CObject* value = &type_arguments_marker; | 486 Dart_CObject* value = &type_arguments_marker; |
| 487 AddBackRef(object_id, value, kIsDeserialized); | 487 AddBackRef(object_id, value, kIsDeserialized); |
| 488 Dart_CObject* length = ReadObjectImpl(); | 488 Dart_CObject* length = ReadObjectImpl(); |
| 489 ASSERT(length->type == Dart_CObject_kInt32); | 489 ASSERT(length->type == Dart_CObject_kInt32); |
| 490 ReadObjectImpl(); // Read and skip instantiations_ field. |
| 490 for (int i = 0; i < length->value.as_int32; i++) { | 491 for (int i = 0; i < length->value.as_int32; i++) { |
| 491 Dart_CObject* type = ReadObjectImpl(); | 492 Dart_CObject* type = ReadObjectImpl(); |
| 492 if (type != &dynamic_type_marker) { | 493 if (type != &dynamic_type_marker) { |
| 493 return AllocateDartCObjectUnsupported(); | 494 return AllocateDartCObjectUnsupported(); |
| 494 } | 495 } |
| 495 } | 496 } |
| 496 return value; | 497 return value; |
| 497 } | 498 } |
| 498 case kTypeParameterCid: { | 499 case kTypeParameterCid: { |
| 499 // TODO(sgjesse): Fix this workaround ignoring the type parameter. | 500 // TODO(sgjesse): Fix this workaround ignoring the type parameter. |
| (...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1172 if (!success) { | 1173 if (!success) { |
| 1173 UnmarkAllCObjects(object); | 1174 UnmarkAllCObjects(object); |
| 1174 return false; | 1175 return false; |
| 1175 } | 1176 } |
| 1176 } | 1177 } |
| 1177 UnmarkAllCObjects(object); | 1178 UnmarkAllCObjects(object); |
| 1178 return true; | 1179 return true; |
| 1179 } | 1180 } |
| 1180 | 1181 |
| 1181 } // namespace dart | 1182 } // namespace dart |
| OLD | NEW |