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

Unified Diff: runtime/vm/object.cc

Issue 1134623004: - Use conditional code inclusion for the dart_no_snapshot and dart executables using the MACRO DART… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 7 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/object.h ('k') | runtime/vm/vm.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc (revision 45699)
+++ runtime/vm/object.cc (working copy)
@@ -927,6 +927,10 @@
RawError* Object::Init(Isolate* isolate) {
TIMERSCOPE(isolate, time_bootstrap);
+
+#if defined(DART_NO_SNAPSHOT)
+ // Object::Init version when we are running in a version of dart that does
+ // not have a full snapshot linked in.
ObjectStore* object_store = isolate->object_store();
Class& cls = Class::Handle(isolate);
@@ -1426,11 +1430,10 @@
isolate->object_store()->InitKnownObjects();
return Error::null();
-}
-
-
-void Object::InitFromSnapshot(Isolate* isolate) {
- TIMERSCOPE(isolate, time_bootstrap);
+#else // defined(DART_NO_SNAPSHOT).
+ // Object::Init version when we are running in a version of dart that has
+ // a full snapshot linked in and an isolate is initialized using the full
+ // snapshot.
ObjectStore* object_store = isolate->object_store();
Class& cls = Class::Handle();
@@ -1540,6 +1543,9 @@
object_store->set_empty_context(context);
StubCode::InitBootstrapStubs(isolate);
+#endif // defined(DART_NO_SNAPSHOT).
+
+ return Error::null();
}
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/vm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698