Pass in the isolate parameter to the weak persistent callback handler so that

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 2327 matching lines @@
     intptr_t cur_token_pos_;
     Token::Kind cur_token_kind_;
     intptr_t cur_token_obj_index_;
     Iterator::StreamType stream_type_;
   };
 
  private:
   void SetPrivateKey(const String& value) const;
 
   static RawTokenStream* New();
-  static void DataFinalizer(Dart_WeakPersistentHandle handle, void *peer);
+  static void DataFinalizer(Dart_Isolate isolate,
+                            Dart_WeakPersistentHandle handle,
+                            void *peer);
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(TokenStream, Object);
   friend class Class;
 };
 
 
 class Script : public Object {
  public:
   RawString* url() const { return raw_ptr()->url_; }
   bool HasSource() const;
@@ skipping 2922 matching lines @@
   // "str" must be OneByteString.
   static RawOneByteString* SubStringUnchecked(const String& str,
                                               intptr_t begin_index,
                                               intptr_t length,
                                               Heap::Space space);
 
   static void SetPeer(const String& str,
                       void* peer,
                       Dart_PeerFinalizer cback);
 
-  static void Finalize(Dart_WeakPersistentHandle handle, void* peer);
+  static void Finalize(Dart_Isolate isolate,
+                       Dart_WeakPersistentHandle handle,
+                       void* peer);
 
   static const ClassId kClassId = kOneByteStringCid;
 
   static RawOneByteString* null() {
     return reinterpret_cast<RawOneByteString*>(Object::null());
   }
 
  private:
   static RawOneByteString* raw(const String& str) {
     return reinterpret_cast<RawOneByteString*>(str.raw());
@@ skipping 70 matching lines @@
                                      Heap::Space space);
 
   static RawTwoByteString* Transform(int32_t (*mapping)(int32_t ch),
                                      const String& str,
                                      Heap::Space space);
 
   static void SetPeer(const String& str,
                       void* peer,
                       Dart_PeerFinalizer cback);
 
-  static void Finalize(Dart_WeakPersistentHandle handle, void* peer);
+  static void Finalize(Dart_Isolate isolate,
+                       Dart_WeakPersistentHandle handle,
+                       void* peer);
 
   static RawTwoByteString* null() {
     return reinterpret_cast<RawTwoByteString*>(Object::null());
   }
 
 
   static const ClassId kClassId = kTwoByteStringCid;
 
  private:
   static RawTwoByteString* raw(const String& str) {
@@ skipping 72 matching lines @@
     return &(raw_ptr(str)->external_data_->data()[index]);
   }
 
   static void SetExternalData(const String& str,
                               ExternalStringData<uint8_t>* data) {
     ASSERT(str.IsExternalOneByteString());
     NoGCScope no_gc;
     raw_ptr(str)->external_data_ = data;
   }
 
-  static void Finalize(Dart_WeakPersistentHandle handle, void* peer);
+  static void Finalize(Dart_Isolate isolate,
+                       Dart_WeakPersistentHandle handle,
+                       void* peer);
 
   static RawExternalOneByteString* ReadFrom(SnapshotReader* reader,
                                             intptr_t object_id,
                                             intptr_t tags,
                                             Snapshot::Kind kind);
 
   static intptr_t NextFieldOffset() {
     // Indicates this class cannot be extended by dart code.
     return -kWordSize;
   }
@@ skipping 50 matching lines @@
     return &(raw_ptr(str)->external_data_->data()[index]);
   }
 
   static void SetExternalData(const String& str,
                               ExternalStringData<uint16_t>* data) {
     ASSERT(str.IsExternalTwoByteString());
     NoGCScope no_gc;
     raw_ptr(str)->external_data_ = data;
   }
 
-  static void Finalize(Dart_WeakPersistentHandle handle, void* peer);
+  static void Finalize(Dart_Isolate isolate,
+                       Dart_WeakPersistentHandle handle,
+                       void* peer);
 
   static RawExternalTwoByteString* ReadFrom(SnapshotReader* reader,
                                             intptr_t object_id,
                                             intptr_t tags,
                                             Snapshot::Kind kind);
 
   static intptr_t NextFieldOffset() {
     // Indicates this class cannot be extended by dart code.
     return -kWordSize;
   }
@@ skipping 1109 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_