Remove isolate pointer from context objects.

runtime/vm/stub_code.h

 // Copyright (c) 2011, 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.
 
 #ifndef VM_STUB_CODE_H_
 #define VM_STUB_CODE_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 
 namespace dart {
 
 // Forward declarations.
 class Code;
 class Isolate;
 class ObjectPointerVisitor;
 class RawCode;
 
 
 // List of stubs created in the VM isolate, these stubs are shared by different
 // isolates running in this dart process.
 #define VM_STUB_CODE_LIST(V)                                                   \
   V(PrintStopMessage)                                                          \
-  V(CallToRuntime)                                                             \
-  V(LazyCompile)                                                               \
-  V(CallBootstrapCFunction)                                                    \
-  V(CallNativeCFunction)                                                       \
-  V(CallStaticFunction)                                                        \
-  V(FixCallersTarget)                                                          \
-  V(FixAllocationStubTarget)                                                   \
-  V(FixAllocateArrayStubTarget)                                                \
-  V(Deoptimize)                                                                \
-  V(DeoptimizeLazy)                                                            \
-  V(ICCallBreakpoint)                                                          \
-  V(ClosureCallBreakpoint)                                                     \
-  V(RuntimeCallBreakpoint)                                                     \
-  V(DebugStepCheck)                                                            \
   V(GetStackPointer)                                                           \
   V(JumpToExceptionHandler)                                                    \
-  V(UnoptimizedIdenticalWithNumberCheck)                                       \
-  V(OptimizedIdenticalWithNumberCheck)                                         \
 
 // Is it permitted for the stubs above to refer to Object::null(), which is
 // allocated in the VM isolate and shared across all isolates.
 // However, in cases where a simple GC-safe placeholder is needed on the stack,
 // using Smi 0 instead of Object::null() is slightly more efficient, since a Smi
 // does not require relocation.
 
 // List of stubs created per isolate, these stubs could potentially contain
 // embedded objects and hence cannot be shared across isolates.
-#define STUB_CODE_LIST(V)                                                      \
+// The initial stubs are needed for loading bootstrapping scripts and have to
+// be generated before Object::Init is called.
+#define BOOTSTRAP_STUB_CODE_LIST(V)                                            \
+  V(CallToRuntime)                                                             \
+  V(LazyCompile)                                                               \
+
+#define REST_STUB_CODE_LIST(V)                                                 \
+  V(CallBootstrapCFunction)                                                    \
+  V(CallNativeCFunction)                                                       \
+  V(FixCallersTarget)                                                          \
+  V(CallStaticFunction)                                                        \
+  V(FixAllocationStubTarget)                                                   \
+  V(FixAllocateArrayStubTarget)                                                \
   V(CallClosureNoSuchMethod)                                                   \
   V(AllocateContext)                                                           \
   V(UpdateStoreBuffer)                                                         \
   V(OneArgCheckInlineCache)                                                    \
   V(TwoArgsCheckInlineCache)                                                   \
   V(ThreeArgsCheckInlineCache)                                                 \
   V(SmiAddInlineCache)                                                         \
   V(SmiSubInlineCache)                                                         \
   V(SmiEqualInlineCache)                                                       \
   V(OneArgOptimizedCheckInlineCache)                                           \
   V(TwoArgsOptimizedCheckInlineCache)                                          \
   V(ThreeArgsOptimizedCheckInlineCache)                                        \
   V(ZeroArgsUnoptimizedStaticCall)                                             \
   V(OneArgUnoptimizedStaticCall)                                               \
   V(TwoArgsUnoptimizedStaticCall)                                              \
   V(OptimizeFunction)                                                          \
   V(InvokeDartCode)                                                            \
   V(Subtype1TestCache)                                                         \
   V(Subtype2TestCache)                                                         \
   V(Subtype3TestCache)                                                         \
+  V(Deoptimize)                                                                \
+  V(DeoptimizeLazy)                                                            \
+  V(ICCallBreakpoint)                                                          \
+  V(ClosureCallBreakpoint)                                                     \
+  V(RuntimeCallBreakpoint)                                                     \
+  V(UnoptimizedIdenticalWithNumberCheck)                                       \
+  V(OptimizedIdenticalWithNumberCheck)                                         \
+  V(DebugStepCheck)                                                            \
+
+#define STUB_CODE_LIST(V)                                                      \
+  BOOTSTRAP_STUB_CODE_LIST(V)                                                  \
+  REST_STUB_CODE_LIST(V)
 
 // class StubEntry is used to describe stub methods generated in dart to
 // abstract out common code executed from generated dart code.
 class StubEntry {
  public:
   explicit StubEntry(const Code& code);
   ~StubEntry() {}
 
   const ExternalLabel& label() const { return label_; }
   uword EntryPoint() const { return entry_point_; }
@@ skipping 17 matching lines @@
 class StubCode {
  public:
   explicit StubCode(Isolate* isolate)
     :
 #define STUB_CODE_INITIALIZER(name)                                            \
         name##_entry_(NULL),
   STUB_CODE_LIST(STUB_CODE_INITIALIZER)
         isolate_(isolate) {}
   ~StubCode();
 
-  void GenerateFor(Isolate* isolate);
 
   // Generate all stubs which are shared across all isolates, this is done
   // only once and the stub code resides in the vm_isolate heap.
   static void InitOnce();
 
   // Generate all stubs which are generated on a per isolate basis as they
   // have embedded objects which are isolate specific.
+  // Bootstrap stubs are needed before Object::Init to compile the bootstrap
+  // scripts.
+  static void InitBootstrapStubs(Isolate* isolate);
   static void Init(Isolate* isolate);
 
   static void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   // Check if specified pc is in the dart invocation stub used for
   // transitioning into dart code.
   static bool InInvocationStub(uword pc);
 
   static bool InInvocationStubForIsolate(Isolate* isolate, uword pc);
 
@@ skipping 38 matching lines @@
 #undef STUB_CODE_ACCESSOR
 
   static RawCode* GetAllocationStubForClass(const Class& cls);
   RawCode* GetAllocateArrayStub();
 
   uword UnoptimizedStaticCallEntryPoint(intptr_t num_args_tested);
 
   static const intptr_t kNoInstantiator = 0;
 
  private:
+  void GenerateBootstrapStubsFor(Isolate* isolate);
+  void GenerateStubsFor(Isolate* isolate);
+
   friend class MegamorphicCacheTable;
 
   static const intptr_t kStubCodeSize = 4 * KB;
 
 #define STUB_CODE_GENERATE(name)                                               \
   static void Generate##name##Stub(Assembler* assembler);
   VM_STUB_CODE_LIST(STUB_CODE_GENERATE);
   STUB_CODE_LIST(STUB_CODE_GENERATE);
 #undef STUB_CODE_GENERATE
 
@@ skipping 32 matching lines @@
       Assembler* assembler,
       const Register left,
       const Register right,
       const Register temp1 = kNoRegister,
       const Register temp2 = kNoRegister);
 };
 
 }  // namespace dart
 
 #endif  // VM_STUB_CODE_H_