Remove isolate pointer from context objects.

runtime/vm/stub_code.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/stub_code.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/assembler.h"
 #include "vm/disassembler.h"
@@ skipping 40 matching lines @@
   name##_entry_ = new StubEntry(code);
 
 
 void StubCode::InitOnce() {
   // Generate all the stubs.
   Code& code = Code::Handle();
   VM_STUB_CODE_LIST(STUB_CODE_GENERATE);
 }
 
 
-void StubCode::GenerateFor(Isolate* init) {
-  // Generate all the stubs.
+void StubCode::GenerateBootstrapStubsFor(Isolate* init) {
+  // Generate initial stubs.
   Code& code = Code::Handle();
-  STUB_CODE_LIST(STUB_CODE_GENERATE);
+  BOOTSTRAP_STUB_CODE_LIST(STUB_CODE_GENERATE);
+}
+
+
+void StubCode::GenerateOtherStubsFor(Isolate* init) {

[Vyacheslav Egorov (Google), 2014/10/22 15:45:45]

I find the name "other-stubs" confusing.

+  // Generate all the other stubs.
+  Code& code = Code::Handle();
+  OTHER_STUB_CODE_LIST(STUB_CODE_GENERATE);
 }
 
 #undef STUB_CODE_GENERATE
 
 
-void StubCode::Init(Isolate* isolate) {
+void StubCode::InitBootstrapStubs(Isolate* isolate) {
   StubCode* stubs = new StubCode(isolate);
   isolate->set_stub_code(stubs);
-  stubs->GenerateFor(isolate);
+  stubs->GenerateBootstrapStubsFor(isolate);
+}
+
+
+void StubCode::Init(Isolate* isolate) {
+  StubCode* stubs = isolate->stub_code();
+  stubs->GenerateOtherStubsFor(isolate);
 }
 
 
 void StubCode::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   // The current isolate is needed as part of the macro.
   Isolate* isolate = Isolate::Current();
   StubCode* stubs = isolate->stub_code();
   if (stubs == NULL) return;
   StubEntry* entry;
 #define STUB_CODE_VISIT_OBJECT_POINTER(name)                                   \
@@ skipping 112 matching lines @@
   Isolate* isolate = Isolate::Current();
   if ((isolate != NULL) && (isolate->stub_code() != NULL)) {
     STUB_CODE_LIST(STUB_CODE_TESTER);
   }
 #undef VM_STUB_CODE_TESTER
 #undef STUB_CODE_TESTER
   return NULL;
 }
 
 }  // namespace dart