Move DescriptorArray into the map

src/transitions.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 55 matching lines @@
 
 
 static bool InsertionPointFound(String* key1, String* key2) {
   return key1->Hash() > key2->Hash();
 }
 
 
 MaybeObject* TransitionArray::NewWith(SimpleTransitionFlag flag,
                                       String* key,
                                       Map* target,
-                                      DescriptorArray* descriptors,
                                       Object* back_pointer) {
   TransitionArray* result;
   MaybeObject* maybe_result;
 
   if (flag == SIMPLE_TRANSITION) {
     maybe_result = AllocateRaw(kSimpleTransitionSize);
     if (!maybe_result->To(&result)) return maybe_result;
     result->set(kSimpleTransitionTarget, target);
   } else {
     maybe_result = Allocate(1);
     if (!maybe_result->To(&result)) return maybe_result;
     result->NoIncrementalWriteBarrierSet(0, key, target);
   }
   result->set_back_pointer_storage(back_pointer);
-  result->set_descriptors(descriptors);
   return result;
 }
 
 
-MaybeObject* TransitionArray::AllocateDescriptorsHolder() {
-  return AllocateRaw(kDescriptorsHolderSize);
-}
-
-
 MaybeObject* TransitionArray::ExtendToFullTransitionArray() {
   ASSERT(!IsFullTransitionArray());
   int nof = number_of_transitions();
   TransitionArray* result;
   MaybeObject* maybe_result = Allocate(nof);
   if (!maybe_result->To(&result)) return maybe_result;
 
   if (nof == 1) {
     result->NoIncrementalWriteBarrierCopyFrom(this, kSimpleTransitionIndex, 0);
   }
 
-  result->set_descriptors(descriptors());
   result->set_back_pointer_storage(back_pointer_storage());
   return result;
 }
 
 
 MaybeObject* TransitionArray::CopyInsert(String* name, Map* target) {
   TransitionArray* result;
 
   int number_of_transitions = this->number_of_transitions();
   int new_size = number_of_transitions;
 
   int insertion_index = this->Search(name);
   if (insertion_index == kNotFound) ++new_size;
 
   MaybeObject* maybe_array;
   maybe_array = TransitionArray::Allocate(new_size);
   if (!maybe_array->To(&result)) return maybe_array;
 
-  result->set_descriptors(descriptors());
-
   if (HasElementsTransition()) {
     result->set_elements_transition(elements_transition());
   }
 
   if (HasPrototypeTransitions()) {
     result->SetPrototypeTransitions(GetPrototypeTransitions());
   }
 
   if (insertion_index != kNotFound) {
     for (int i = 0; i < number_of_transitions; ++i) {
@@ skipping 18 matching lines @@
     result->NoIncrementalWriteBarrierCopyFrom(
         this, insertion_index, insertion_index + 1);
   }
 
   result->set_back_pointer_storage(back_pointer_storage());
   return result;
 }
 
 
 } }  // namespace v8::internal