Make isolate specific stub code accessors instance methods instead

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 78 matching lines @@
 #undef STUB_CODE_VISIT_OBJECT_POINTER
 }
 
 
 bool StubCode::InInvocationStub(uword pc) {
   return InInvocationStubForIsolate(Isolate::Current(), pc);
 }
 
 
 bool StubCode::InInvocationStubForIsolate(Isolate* isolate, uword pc) {
-  StubEntry* invoke_dart_entry = isolate->stub_code()->InvokeDartCode_entry_;
-  uword entry = invoke_dart_entry->EntryPoint();
-  uword size = invoke_dart_entry->Size();
+  StubCode* stub_code = isolate->stub_code();
+  uword entry = stub_code->InvokeDartCodeEntryPoint();
+  uword size = stub_code->InvokeDartCodeSize();
   return (pc >= entry) && (pc < (entry + size));
 }
 
 
 RawCode* StubCode::GetAllocationStubForClass(const Class& cls) {
   Isolate* isolate = Isolate::Current();
   const Error& error = Error::Handle(isolate, cls.EnsureIsFinalized(isolate));
   ASSERT(error.IsNull());
   Code& stub = Code::Handle(isolate, cls.allocation_stub());
   if (stub.IsNull()) {
@@ skipping 23 matching lines @@
     OS::Print("Code for stub '%s': {\n", name);
     DisassembleToStdout formatter;
     code.Disassemble(&formatter);
     OS::Print("}\n");
   }
   return code.raw();
 }
 
 
 const char* StubCode::NameOfStub(uword entry_point) {
-#define STUB_CODE_TESTER(name) \
+#define VM_STUB_CODE_TESTER(name)                                              \
   if ((name##_entry() != NULL) && (entry_point == name##EntryPoint())) {       \
     return ""#name;                                                            \
   }
+  VM_STUB_CODE_LIST(VM_STUB_CODE_TESTER);
 
-  VM_STUB_CODE_LIST(STUB_CODE_TESTER);
+#define STUB_CODE_TESTER(name)                                                 \
+  if ((isolate->stub_code()->name##_entry() != NULL) &&                        \
+      (entry_point == isolate->stub_code()->name##EntryPoint())) {             \
+    return ""#name;                                                            \
+  }
   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