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

Unified Diff: vm/snapshot.cc

Issue 10869005: Retry r11091 with explicit template instatiation to keep the linker happy. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 8 years, 4 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
« vm/object.cc ('K') | « vm/raw_object_snapshot.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vm/snapshot.cc
===================================================================
--- vm/snapshot.cc (revision 11096)
+++ vm/snapshot.cc (working copy)
@@ -48,7 +48,7 @@
static intptr_t ObjectIdFromClassId(intptr_t class_id) {
- ASSERT(class_id > kIllegalCid && class_id < kNumPredefinedCids);
+ ASSERT((class_id > kIllegalCid) && (class_id < kNumPredefinedCids));
return (class_id + kClassIdsOffset);
}
@@ -414,7 +414,8 @@
ASSERT(kind_ == Snapshot::kFull);
ASSERT(isolate()->no_gc_scope_depth() != 0);
if (class_id < kNumPredefinedCids) {
- return Class::GetClass(class_id, is_signature_class);
+ ASSERT((class_id >= kInstanceCid) && (class_id <= kWeakPropertyCid));
+ return isolate()->class_table()->At(class_id);
}
cls_ = Object::class_class();
RawClass* obj = reinterpret_cast<RawClass*>(
« vm/object.cc ('K') | « vm/raw_object_snapshot.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698