- Merge function lists when patching classes (no more duplicates).

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 656 matching lines @@
 
   RawCode* allocation_stub() const {
     return raw_ptr()->allocation_stub_;
   }
   void set_allocation_stub(const Code& value) const;
 
   RawArray* constants() const;
 
   void Finalize() const;
 
-  void ApplyPatch(const Class& patch) const;
+  const char* ApplyPatch(const Class& patch) const;
 
   // Allocate a class used for VM internal objects.
   template <class FakeObject> static RawClass* New();
 
   // Allocate instance classes and interfaces.
   static RawClass* New(const String& name,
                        const Script& script,
                        intptr_t token_pos);
   static RawClass* NewInterface(const String& name,
                                 const Script& script,
@@ skipping 4826 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_