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

Unified Diff: runtime/vm/dart.cc

Issue 668193002: Remove isolate pointer from context objects. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: fixed initialization order bug Created 6 years, 2 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/assembler_x64.cc ('k') | runtime/vm/dart_entry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/dart.cc
===================================================================
--- runtime/vm/dart.cc (revision 41244)
+++ runtime/vm/dart.cc (working copy)
@@ -204,15 +204,24 @@
Profiler::InitProfilingForIsolate(isolate);
if (snapshot_buffer == NULL) {
- const Error& error = Error::Handle(Object::Init(isolate));
+ Error& error = Error::Handle(Object::Init(isolate));
if (!error.IsNull()) {
return error.raw();
}
+
+ StubCode::InitBootstrapStubs(isolate);
Vyacheslav Egorov (Google) 2014/10/24 10:58:08 Why don't you move this into Object::Init?
Florian Schneider 2014/10/24 11:24:39 Done.
+
+ error = Object::FinishInit(isolate);
+ if (!error.IsNull()) {
+ return error.raw();
+ }
} else {
// Initialize from snapshot (this should replicate the functionality
// of Object::Init(..) in a regular isolate creation path.
Object::InitFromSnapshot(isolate);
+ StubCode::InitBootstrapStubs(isolate);
+
// TODO(turnidge): Remove once length is not part of the snapshot.
const Snapshot* snapshot = Snapshot::SetupFromBuffer(snapshot_buffer);
if (snapshot == NULL) {
« no previous file with comments | « runtime/vm/assembler_x64.cc ('k') | runtime/vm/dart_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698