diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2014-05-23 14:01:17 +0000 |
|---|---|---|
| committer | Trevor Norris <trev.norris@gmail.com> | 2014-09-09 16:52:45 -0700 |
| commit | 8d9493c315aad5487b5e2a0e48c33ceefb590f2e (patch) | |
| tree | 00ac1963dd91ed5a9fd7ed78e274ca382db8638f | |
| parent | b8a8e5558d74333e141e3a72730eb72c3463c3ef (diff) | |
| download | node-8d9493c315aad5487b5e2a0e48c33ceefb590f2e.tar.gz | |
deps: cherry-pick r21466 from v8 trunk
Check for cached transition to ExternalArray elements kind.
See [1] and [2] for details.
[1] https://code.google.com/p/v8/issues/detail?id=3337
[2] https://codereview.chromium.org/291193011
Signed-off-by: Fedor Indutny <fedor@indutny.com>
| -rw-r--r-- | deps/v8/src/objects.cc | 9 | ||||
| -rw-r--r-- | deps/v8/test/cctest/test-api.cc | 17 |
2 files changed, 25 insertions, 1 deletions
diff --git a/deps/v8/src/objects.cc b/deps/v8/src/objects.cc index 8ffd462db..ec569d141 100644 --- a/deps/v8/src/objects.cc +++ b/deps/v8/src/objects.cc @@ -3373,9 +3373,16 @@ static Map* FindClosestElementsTransition(Map* map, ElementsKind to_kind) { ? to_kind : TERMINAL_FAST_ELEMENTS_KIND; - // Support for legacy API. + // Support for legacy API: SetIndexedPropertiesTo{External,Pixel}Data + // allows to change elements from arbitrary kind to any ExternalArray + // elements kind. Satisfy its requirements, checking whether we already + // have the cached transition. if (IsExternalArrayElementsKind(to_kind) && !IsFixedTypedArrayElementsKind(map->elements_kind())) { + if (map->HasElementsTransition()) { + Map* next_map = map->elements_transition_map(); + if (next_map->elements_kind() == to_kind) return next_map; + } return map; } diff --git a/deps/v8/test/cctest/test-api.cc b/deps/v8/test/cctest/test-api.cc index d8fa648bf..14df05a8e 100644 --- a/deps/v8/test/cctest/test-api.cc +++ b/deps/v8/test/cctest/test-api.cc @@ -21341,6 +21341,23 @@ THREADED_TEST(Regress142088) { } +THREADED_TEST(Regress3337) { + LocalContext context; + v8::Isolate* isolate = context->GetIsolate(); + v8::HandleScope scope(isolate); + Local<v8::Object> o1 = Object::New(isolate); + Local<v8::Object> o2 = Object::New(isolate); + i::Handle<i::JSObject> io1 = v8::Utils::OpenHandle(*o1); + i::Handle<i::JSObject> io2 = v8::Utils::OpenHandle(*o2); + CHECK(io1->map() == io2->map()); + o1->SetIndexedPropertiesToExternalArrayData( + NULL, v8::kExternalUint32Array, 0); + o2->SetIndexedPropertiesToExternalArrayData( + NULL, v8::kExternalUint32Array, 0); + CHECK(io1->map() == io2->map()); +} + + THREADED_TEST(Regress137496) { i::FLAG_expose_gc = true; LocalContext context; |