Added macros OBJECT_IMPLEMENTATION and FINAL_OBJECT_IMPLEMENTATION

vm/cha.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/cha.h"
 #include "vm/class_table.h"
 #include "vm/flags.h"
 #include "vm/freelist.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
@@ skipping 31 matching lines @@
 // Recursively collect direct and indirect subclass ids of cls.
 static void CollectSubclassIds(ZoneGrowableArray<intptr_t>* cids,
                                const Class& cls) {
   const GrowableObjectArray& cls_direct_subclasses =
       GrowableObjectArray::Handle(cls.direct_subclasses());
   if (cls_direct_subclasses.IsNull()) {
     return;
   }
   Class& direct_subclass = Class::Handle();
   for (intptr_t i = 0; i < cls_direct_subclasses.Length(); i++) {
-    direct_subclass |= cls_direct_subclasses.At(i);
+    direct_subclass ^= cls_direct_subclasses.At(i);
     intptr_t direct_subclass_id = direct_subclass.id();
     if (!ContainsCid(cids, direct_subclass_id)) {
       cids->Add(direct_subclass_id);
       CollectSubclassIds(cids, direct_subclass);
     }
   }
 }
 
 
 ZoneGrowableArray<intptr_t>* CHA::GetSubclassIdsOf(intptr_t cid) {
   ASSERT(cid > kInstanceCid);
   const ClassTable& class_table = *Isolate::Current()->class_table();
   const Class& cls = Class::Handle(class_table.At(cid));
   ASSERT(!cls.IsNull());
   ZoneGrowableArray<intptr_t>* ids = new ZoneGrowableArray<intptr_t>();
   CollectSubclassIds(ids, cls);
   return ids;
 }
 
 
 bool CHA::HasOverride(const Class& cls, const String& function_name) {
   const GrowableObjectArray& cls_direct_subclasses =
       GrowableObjectArray::Handle(cls.direct_subclasses());
   if (cls_direct_subclasses.IsNull()) {
     return false;
   }
   Class& direct_subclass = Class::Handle();
   for (intptr_t i = 0; i < cls_direct_subclasses.Length(); i++) {
-    direct_subclass |= cls_direct_subclasses.At(i);
+    direct_subclass ^= cls_direct_subclasses.At(i);
     if (direct_subclass.LookupDynamicFunction(function_name) !=
         Function::null()) {
       return true;
     }
     if (HasOverride(direct_subclass, function_name)) {
       return true;
     }
   }
   return false;
 }
@@ skipping 24 matching lines @@
   ASSERT(!function.IsNull());
   ASSERT(function.IsDynamicFunction());
   const Class& function_owner = Class::Handle(function.Owner());
   const String& function_name = String::Handle(function.name());
   ZoneGrowableArray<intptr_t>* cids = new ZoneGrowableArray<intptr_t>();
   CollectSubclassIds(cids, function_owner);
   return GetNamedInstanceFunctionsOf(*cids, function_name);
 }
 
 }  // namespace dart