Version 3.10.3

src/interface.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 61 matching lines @@
     void* name, uint32_t hash, Interface* interface, bool* ok) {
   MakeModule(ok);
   if (!*ok) return;
 
 #ifdef DEBUG
   if (FLAG_print_interface_details) {
     PrintF("%*s# Adding...\n", Nesting::current(), "");
     PrintF("%*sthis = ", Nesting::current(), "");
     this->Print(Nesting::current());
     PrintF("%*s%s : ", Nesting::current(), "",
-           (*reinterpret_cast<String**>(name))->ToAsciiArray());
+           (*static_cast<String**>(name))->ToAsciiArray());
     interface->Print(Nesting::current());
   }
 #endif
 
   ZoneHashMap** map = &Chase()->exports_;
   if (*map == NULL) *map = new ZoneHashMap(Match, 8);
 
   ZoneHashMap::Entry* p = (*map)->Lookup(name, hash, !IsFrozen());
   if (p == NULL) {
     // This didn't have name but was frozen already, that's an error.
     *ok = false;
   } else if (p->value == NULL) {
     p->value = interface;
   } else {
 #ifdef DEBUG
     Nesting nested;
 #endif
-    reinterpret_cast<Interface*>(p->value)->Unify(interface, ok);
+    static_cast<Interface*>(p->value)->Unify(interface, ok);
   }
 
 #ifdef DEBUG
   if (FLAG_print_interface_details) {
     PrintF("%*sthis' = ", Nesting::current(), "");
     this->Print(Nesting::current());
     PrintF("%*s# Added.\n", Nesting::current(), "");
   }
 #endif
 }
@@ skipping 62 matching lines @@
 
   // If the new interface is larger than that's, then there were members in
   // 'this' which 'that' didn't have. If 'that' was frozen that is an error.
   int this_size = this->exports_ == NULL ? 0 : this->exports_->occupancy();
   int that_size = map == NULL ? 0 : map->occupancy();
   if (that->IsFrozen() && this_size > that_size) {
     *ok = false;
     return;
   }
 
+  // Merge instance.
+  if (!that->instance_.is_null()) {
+    if (!this->instance_.is_null() && *this->instance_ != *that->instance_) {
+      *ok = false;
+      return;
+    }
+    this->instance_ = that->instance_;
+  }
+
   // Merge interfaces.
   this->flags_ |= that->flags_;
   that->forward_ = this;
 }
 
 
 #ifdef DEBUG
 void Interface::Print(int n) {
   int n0 = n > 0 ? n : 0;
 
@@ skipping 24 matching lines @@
         PrintF("%*s%s : ", n0 + 2, "", name->ToAsciiArray());
         interface->Print(n0 + 2);
       }
       PrintF("%*s}\n", n0, "");
     }
   }
 }
 #endif
 
 } }  // namespace v8::internal