Separating transitions from descriptors.

src/transitions.cc

Index: src/transitions.cc
diff --git a/src/transitions.cc b/src/transitions.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3797f2d65cc03413faf0fe4fd043a3e70aa2f648
--- /dev/null
+++ b/src/transitions.cc
@@ -0,0 +1,132 @@
+// 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
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "v8.h"
+
+#include "objects.h"
+#include "transitions-inl.h"
+#include "transitions.h"

[Jakob Kummerow, 2012/06/29 16:31:36]

transitions-inl.h is enough.

[Toon Verwaest, 2012/07/05 12:56:11]

Done.

+#include "utils.h"
+
+namespace v8 {
+namespace internal {
+
+
+MaybeObject* TransitionArray::Allocate(int number_of_transitions) {
+  Heap* heap = Isolate::Current()->heap();
+  // Use FixedArray to not use DescriptorArray::cast on incomplete object.
+  FixedArray* array;
+  { MaybeObject* maybe_array =
+        heap->AllocateFixedArray(ToKeyIndex(number_of_transitions));
+    if (!maybe_array->To(&array)) return maybe_array;
+  }
+
+  array->set(kElementsTransitionIndex, Smi::FromInt(0));
+  return array;
+}
+
+
+void TransitionArray::CopyFrom(TransitionArray* origin,
+                               int origin_transition,
+                               int target_transition) {
+  this->Set(target_transition,
+            origin->GetKey(origin_transition),
+            origin->GetValue(origin_transition));
+}
+
+
+static bool InsertionPointFound(String* key1, String* key2) {
+  return key1->Hash() > key2->Hash();
+}
+
+
+bool TransitionArray::TransitionsTo(Object* target) {
+  if (this->elements() == reinterpret_cast<Map*>(target)) return true;
+  for (int i = 0; i < this->number_of_transitions(); ++i) {
+    Object* value = GetValue(i);
+    if (value->IsAccessorPair()) {
+      AccessorPair* accessors = AccessorPair::cast(value);
+      if (accessors->getter() == target ||
+          accessors->setter() == target) return true;
+    } else {
+      if (target == value) return true;
+    }
+  }
+  return false;
+}
+
+
+MaybeObject* TransitionArray::CopyInsert(String* name, Object* value) {
+  TransitionArray* result;
+  if (this == NULL) {

[Jakob Kummerow, 2012/06/29 16:31:36]

can this happen?

[Toon Verwaest, 2012/07/05 12:56:11]

Done.

+    { MaybeObject* maybe_array;
+      maybe_array = TransitionArray::Allocate(1);
+      if (!maybe_array->To(&result)) return maybe_array;
+    }
+
+    result->Set(0, name, value);
+    return 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;
+  }
+
+  if (HasElementsTransition()) result->set_elements(elements());
+
+  if (insertion_index != kNotFound) {
+    for (int i = 0; i < number_of_transitions; ++i) {
+      if (i != insertion_index) result->CopyFrom(this, i, i);
+    }
+    result->Set(insertion_index, name, value);
+    return result;
+  }
+
+  insertion_index = 0;
+  for (; insertion_index < number_of_transitions; ++insertion_index) {
+    if (InsertionPointFound(GetKey(insertion_index), name)) break;
+    result->CopyFrom(this, insertion_index, insertion_index);
+  }
+
+  result->Set(insertion_index, name, value);
+
+  for (; insertion_index < number_of_transitions; ++insertion_index) {
+    result->CopyFrom(this, insertion_index, insertion_index + 1);
+  }
+
+  return result;
+}
+
+
+} }  // namespace v8::internal