Handlefy Descriptor and other code in objects.cc

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 26 matching lines @@
 
 static MaybeObject* AllocateRaw(Isolate* isolate, int length) {
   // Use FixedArray to not use TransitionArray::cast on incomplete object.
   FixedArray* array;
   MaybeObject* maybe_array = isolate->heap()->AllocateFixedArray(length);
   if (!maybe_array->To(&array)) return maybe_array;
   return array;
 }
 
 
+static Handle<TransitionArray> AllocateRawHandle(Isolate* isolate, int length) {
+  // Use FixedArray to not use TransitionArray::cast on incomplete object.
+  Handle<FixedArray> array = isolate->factory()->NewFixedArray(length);
+  return Handle<TransitionArray>::cast(array);
+}
+
+
+
 MaybeObject* TransitionArray::Allocate(Isolate* isolate,
                                        int number_of_transitions) {
   FixedArray* array;
   MaybeObject* maybe_array =
       AllocateRaw(isolate, ToKeyIndex(number_of_transitions));
   if (!maybe_array->To(&array)) return maybe_array;
   array->set(kPrototypeTransitionsIndex, Smi::FromInt(0));
   return array;
 }
 
 
 void TransitionArray::NoIncrementalWriteBarrierCopyFrom(TransitionArray* origin,
                                                         int origin_transition,
                                                         int target_transition) {
   NoIncrementalWriteBarrierSet(target_transition,
                                origin->GetKey(origin_transition),
                                origin->GetTarget(origin_transition));
 }
 
 
 static bool InsertionPointFound(Name* key1, Name* key2) {
   return key1->Hash() > key2->Hash();
 }
 
 
+Handle<TransitionArray> TransitionArray::NewWithHandle(
+    SimpleTransitionFlag flag,
+    Handle<Name> key,
+    Handle<Map> target,
+    Handle<Object> back_pointer) {
+  Handle<TransitionArray> result;
+
+  if (flag == SIMPLE_TRANSITION) {
+    result = AllocateRawHandle(target->GetIsolate(), kSimpleTransitionSize);
+    result->set(kSimpleTransitionTarget, *target);
+  } else {
+    result = AllocateHandle(target->GetIsolate(), 1);
+    result->NoIncrementalWriteBarrierSet(0, *key, *target);
+  }
+  result->set_back_pointer_storage(*back_pointer);
+  return result;
+}
+
+
 MaybeObject* TransitionArray::NewWith(SimpleTransitionFlag flag,
                                       Name* key,
                                       Map* target,
                                       Object* back_pointer) {
   TransitionArray* result;
   MaybeObject* maybe_result;
 
   if (flag == SIMPLE_TRANSITION) {
     maybe_result = AllocateRaw(target->GetIsolate(), kSimpleTransitionSize);
     if (!maybe_result->To(&result)) return maybe_result;
@@ skipping 17 matching lines @@
 
   if (nof == 1) {
     result->NoIncrementalWriteBarrierCopyFrom(this, kSimpleTransitionIndex, 0);
   }
 
   result->set_back_pointer_storage(back_pointer_storage());
   return result;
 }
 
 
+Handle<TransitionArray> TransitionArray::AllocateHandle(
+    Isolate* isolate, int number_of_transitions) {
+  Handle<FixedArray> array =
+      isolate->factory()->NewFixedArray(ToKeyIndex(number_of_transitions));
+  array->set(kPrototypeTransitionsIndex, Smi::FromInt(0));
+  return Handle<TransitionArray>::cast(array);
+}
+
+
 MaybeObject* TransitionArray::CopyInsert(Name* 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(GetIsolate(), new_size);
   if (!maybe_array->To(&result)) return maybe_array;
 
   if (HasPrototypeTransitions()) {
     result->SetPrototypeTransitions(GetPrototypeTransitions());
   }
@@ skipping 21 matching lines @@
   for (; insertion_index < number_of_transitions; ++insertion_index) {
     result->NoIncrementalWriteBarrierCopyFrom(
         this, insertion_index, insertion_index + 1);
   }
 
   result->set_back_pointer_storage(back_pointer_storage());
   return result;
 }
 
 
+Handle<TransitionArray> TransitionArray::CopyInsert(
+    Handle<TransitionArray> array,
+    Handle<Name> name,
+    Handle<Map> target) {
+  Handle<TransitionArray> result;
+
+  int number_of_transitions = array->number_of_transitions();
+  int new_size = number_of_transitions;
+
+  int insertion_index = array->Search(*name);
+  if (insertion_index == kNotFound) ++new_size;
+
+  result = TransitionArray::AllocateHandle(array->GetIsolate(), new_size);
+
+  if (array->HasPrototypeTransitions()) {
+    result->SetPrototypeTransitions(array->GetPrototypeTransitions());
+  }
+
+  if (insertion_index != kNotFound) {
+    for (int i = 0; i < number_of_transitions; ++i) {

[Toon Verwaest, 2014/04/08 12:58:55]

Wrong. number_of_transitions can change because of
TransitionArray::AllocateHandle; since it's a weak array.

[mvstanton, 2014/04/09 09:43:20]

Done.

+      if (i != insertion_index) {
+        result->NoIncrementalWriteBarrierCopyFrom(*array, i, i);
+      }
+    }
+    result->NoIncrementalWriteBarrierSet(insertion_index, *name, *target);
+    result->set_back_pointer_storage(array->back_pointer_storage());
+    return result;
+  }
+
+  insertion_index = 0;
+  for (; insertion_index < number_of_transitions; ++insertion_index) {
+    if (InsertionPointFound(array->GetKey(insertion_index), *name)) break;
+    result->NoIncrementalWriteBarrierCopyFrom(
+        *array, insertion_index, insertion_index);
+  }
+
+  result->NoIncrementalWriteBarrierSet(insertion_index, *name, *target);
+
+  for (; insertion_index < number_of_transitions; ++insertion_index) {
+    result->NoIncrementalWriteBarrierCopyFrom(
+        *array, insertion_index, insertion_index + 1);
+  }
+
+  result->set_back_pointer_storage(array->back_pointer_storage());
+  return result;
+}
+
+
 } }  // namespace v8::internal