Reviewers: Toon Verwaest,

Message:
PTAL

Description:
Support typed arrays in IsMoreGeneralElementsKindTransition.

[email protected]
BUG=357054
LOG=Y

Please review this at https://codereview.chromium.org/220403004/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+25, -5 lines):
  M src/elements-kind.cc
  A + test/mjsunit/regress/regress-357054.js


Index: src/elements-kind.cc
diff --git a/src/elements-kind.cc b/src/elements-kind.cc
index ff458e0ea169b9222f0fb41adeadcb8e759d323f..7b1a65aae1eb169ac019c37e3095900a21d43603 100644
--- a/src/elements-kind.cc
+++ b/src/elements-kind.cc
@@ -172,8 +172,27 @@ ElementsKind GetNextMoreGeneralFastElementsKind(ElementsKind elements_kind,
 }


+static bool IsTypedArrayElementsKind(ElementsKind elements_kind) {
+  return IsFixedTypedArrayElementsKind(elements_kind) ||
+      IsExternalArrayElementsKind(elements_kind);
+}
+
+
 bool IsMoreGeneralElementsKindTransition(ElementsKind from_kind,
                                          ElementsKind to_kind) {
+  if (IsTypedArrayElementsKind(from_kind) ||
+      IsTypedArrayElementsKind(to_kind)) {
+    switch (from_kind) {
+#define FIXED_TYPED_ARRAY_CASE(Type, type, TYPE, ctype, size) \
+      case TYPE##_ELEMENTS:                                   \
+        return to_kind == EXTERNAL_##TYPE##_ELEMENTS;
+
+      TYPED_ARRAYS(FIXED_TYPED_ARRAY_CASE);
+#undef FIXED_TYPED_ARRAY_CASE
+      default:
+        return false;
+    }
+  }
   switch (from_kind) {
     case FAST_SMI_ELEMENTS:
       return to_kind != FAST_SMI_ELEMENTS;
Index: test/mjsunit/regress/regress-357054.js
diff --git a/test/mjsunit/neuter-twice.js b/test/mjsunit/regress/regress-357054.js
similarity index 56%
copy from test/mjsunit/neuter-twice.js
copy to test/mjsunit/regress/regress-357054.js
index 3501cee4330f966c1eeaf6f5b7ebdc6418f2bcec..92a066edc114d0869371b80f728f70731dc9ffeb 100644
--- a/test/mjsunit/neuter-twice.js
+++ b/test/mjsunit/regress/regress-357054.js
@@ -1,9 +1,10 @@
 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// Flags: --allow-natives-syntax

-var ab = new ArrayBuffer(100);
-%ArrayBufferNeuter(ab);
-%ArrayBufferNeuter(ab);
+[].__defineSetter__(0, function() { });
+function f(a,i,v) { a[i] = v; }
+a = [0,0,0];
+f(a,0,5);
+a = new Float32Array(5);
+f(a,2,5.5);


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to