Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Unified Diff: runtime/vm/dart_api_message.cc

Issue 9939003: Use null type argument vector instead of vector of Dynamic for a generic raw (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/code_generator_x64.cc ('k') | runtime/vm/flow_graph_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/dart_api_message.cc
===================================================================
--- runtime/vm/dart_api_message.cc (revision 6066)
+++ runtime/vm/dart_api_message.cc (working copy)
@@ -17,8 +17,8 @@
static const int kNumInitialReferences = 4;
ApiMessageReader::ApiMessageReader(const uint8_t* buffer,
- intptr_t length,
- ReAlloc alloc)
+ intptr_t length,
+ ReAlloc alloc)
: BaseReader(buffer, length),
alloc_(alloc),
backward_references_(kNumInitialReferences) {
@@ -194,6 +194,23 @@
}
return value;
}
+ case Object::kTypeParameterClass: {
+ // TODO(sjesse): Fix this workaround ignoring the type parameter.
srdjan 2012/03/30 21:46:52 sgjesse
regis 2012/03/30 22:01:43 Done. But many others are spelled "sjesse".
+ Dart_CObject* value = &dynamic_type_marker;
+ AddBackwardReference(object_id, value);
+ intptr_t index = ReadIntptrValue();
+ USE(index);
+ intptr_t token_index = ReadIntptrValue();
+ USE(token_index);
+ int8_t type_state = Read<int8_t>();
+ USE(type_state);
+ Dart_CObject* parameterized_class = ReadObject();
+ // The type parameter is finalized, therefore parameterized_class is null.
+ ASSERT(parameterized_class->type == Dart_CObject::kNull);
+ Dart_CObject* name = ReadObject();
+ ASSERT(name->type == Dart_CObject::kString);
+ return value;
+ }
case ObjectStore::kArrayClass: {
intptr_t len = ReadSmiValue();
Dart_CObject* value = AllocateDartCObjectArray(len);
@@ -295,7 +312,7 @@
return &dynamic_type_marker;
} else {
intptr_t index = object_id - kMaxPredefinedObjectIds;
- ASSERT(index < backward_references_.length());
+ ASSERT((0 <= index) && (index < backward_references_.length()));
ASSERT(backward_references_[index] != NULL);
return backward_references_[index];
}
« no previous file with comments | « runtime/vm/code_generator_x64.cc ('k') | runtime/vm/flow_graph_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698