Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: src/elements.cc

Issue 1330483003: Adding ElementsAccessor::Concat (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@2015-09-01_array_builtins_shift
Patch Set: merging master Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/elements.h ('k') | src/runtime/runtime.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/elements.cc
diff --git a/src/elements.cc b/src/elements.cc
index d56067babb38af4411a642ad1ad39057dccd0c3f..32e6605ca2fbd04d07a80a387a825c6bec346482 100644
--- a/src/elements.cc
+++ b/src/elements.cc
@@ -2350,6 +2350,69 @@ void ElementsAccessor::TearDown() {
}
+Handle<JSArray> ElementsAccessor::Concat(Isolate* isolate, Arguments* args,
+ uint32_t concat_size) {
+ int result_len = 0;
+ ElementsKind elements_kind = GetInitialFastElementsKind();
+ bool has_double = false;
+ {
+ DisallowHeapAllocation no_gc;
+ // Iterate through all the arguments performing checks
+ // and calculating total length.
+ bool is_holey = false;
+ for (uint32_t i = 0; i < concat_size; i++) {
+ Object* arg = (*args)[i];
+ int len = Smi::cast(JSArray::cast(arg)->length())->value();
+
+ // We shouldn't overflow when adding another len.
+ const int kHalfOfMaxInt = 1 << (kBitsPerInt - 2);
+ STATIC_ASSERT(FixedArray::kMaxLength < kHalfOfMaxInt);
+ USE(kHalfOfMaxInt);
+ result_len += len;
+ DCHECK(0 <= result_len);
+ DCHECK(result_len <= FixedDoubleArray::kMaxLength);
+
+ ElementsKind arg_kind = JSArray::cast(arg)->map()->elements_kind();
+ has_double = has_double || IsFastDoubleElementsKind(arg_kind);
+ is_holey = is_holey || IsFastHoleyElementsKind(arg_kind);
+ if (IsMoreGeneralElementsKindTransition(elements_kind, arg_kind)) {
+ elements_kind = arg_kind;
+ }
+ }
+ if (is_holey) {
+ elements_kind = GetHoleyElementsKind(elements_kind);
+ }
+ }
+
+ // If a double array is concatted into a fast elements array, the fast
+ // elements array needs to be initialized to contain proper holes, since
+ // boxing doubles may cause incremental marking.
+ ArrayStorageAllocationMode mode =
+ has_double && IsFastObjectElementsKind(elements_kind)
+ ? INITIALIZE_ARRAY_ELEMENTS_WITH_HOLE
+ : DONT_INITIALIZE_ARRAY_ELEMENTS;
+ Handle<JSArray> result_array = isolate->factory()->NewJSArray(
+ elements_kind, result_len, result_len, Strength::WEAK, mode);
+ if (result_len == 0) return result_array;
+ int j = 0;
+ Handle<FixedArrayBase> storage(result_array->elements(), isolate);
+ ElementsAccessor* accessor = ElementsAccessor::ForKind(elements_kind);
+ for (uint32_t i = 0; i < concat_size; i++) {
+ // It is crucial to keep |array| in a raw pointer form to avoid
+ // performance degradation.
+ JSArray* array = JSArray::cast((*args)[i]);
+ int len = Smi::cast(array->length())->value();
+ if (len > 0) {
+ ElementsKind from_kind = array->GetElementsKind();
+ accessor->CopyElements(array, 0, from_kind, storage, j, len);
+ j += len;
+ }
+ }
+
+ DCHECK(j == result_len);
+ return result_array;
+}
+
ElementsAccessor** ElementsAccessor::elements_accessors_ = NULL;
} // namespace internal
} // namespace v8
« no previous file with comments | « src/elements.h ('k') | src/runtime/runtime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698