Revision: 20021
Author: [email protected]
Date: Tue Mar 18 10:50:00 2014 UTC
Log: Revert "Apply numeric casts correctly in typed arrays and related
code."
This reverts commit r20020 for breaking Win64 build.
[email protected]
Review URL: https://codereview.chromium.org/199523006
http://code.google.com/p/v8/source/detail?r=20021
Deleted:
/branches/bleeding_edge/test/mjsunit/regress/regress-353004.js
Modified:
/branches/bleeding_edge/src/api.cc
/branches/bleeding_edge/src/arraybuffer.js
/branches/bleeding_edge/src/runtime.cc
/branches/bleeding_edge/src/runtime.h
/branches/bleeding_edge/src/typedarray.js
=======================================
--- /branches/bleeding_edge/test/mjsunit/regress/regress-353004.js Tue Mar
18 10:23:50 2014 UTC
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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 buffer1 = new ArrayBuffer(100 * 1024);
-
-var array1 = new Uint8Array(buffer1, {valueOf : function() {
- %ArrayBufferNeuter(buffer1);
- return 0;
-}});
-
-assertEquals(0, array1.length);
-
-var buffer2 = new ArrayBuffer(100 * 1024);
-
-assertThrows(function() {
- var array2 = new Uint8Array(buffer2, 0, {valueOf : function() {
- %ArrayBufferNeuter(buffer2);
- return 100 * 1024;
- }});
-}, RangeError);
-
-
-var buffer3 = new ArrayBuffer(100 * 1024 * 1024);
-var dataView1 = new DataView(buffer3, {valueOf : function() {
- %ArrayBufferNeuter(buffer3);
- return 0;
-}});
-
-assertEquals(0, dataView1.byteLength);
-
-var buffer4 = new ArrayBuffer(100 * 1024);
-assertThrows(function() {
- var dataView2 = new DataView(buffer4, 0, {valueOf : function() {
- %ArrayBufferNeuter(buffer4);
- return 100 * 1024 * 1024;
- }});
-}, RangeError);
-
-
-var buffer5 = new ArrayBuffer(100 * 1024);
-var buffer6 = buffer5.slice({valueOf : function() {
- %ArrayBufferNeuter(buffer5);
- return 0;
-}}, 100 * 1024 * 1024);
-assertEquals(0, buffer6.byteLength);
-
-
-var buffer7 = new ArrayBuffer(100 * 1024 * 1024);
-var buffer8 = buffer7.slice(0, {valueOf : function() {
- %ArrayBufferNeuter(buffer7);
- return 100 * 1024 * 1024;
-}});
-assertEquals(0, buffer8.byteLength);
-
-var buffer9 = new ArrayBuffer(1024);
-var array9 = new Uint8Array(buffer9);
-var array10 = array9.subarray({valueOf : function() {
- %ArrayBufferNeuter(buffer9);
- return 0;
- }}, 1024);
-assertEquals(0, array9.length);
-assertEquals(0, array10.length);
-
-var buffer11 = new ArrayBuffer(1024);
-var array11 = new Uint8Array(buffer11);
-var array12 = array11.subarray(0, {valueOf : function() {
- %ArrayBufferNeuter(buffer11);
- return 1024;
- }});
-assertEquals(0, array11.length);
-assertEquals(0, array12.length);
=======================================
--- /branches/bleeding_edge/src/api.cc Tue Mar 18 10:23:50 2014 UTC
+++ /branches/bleeding_edge/src/api.cc Tue Mar 18 10:50:00 2014 UTC
@@ -5936,7 +5936,20 @@
"Only externalized ArrayBuffers can be neutered");
LOG_API(obj->GetIsolate(), "v8::ArrayBuffer::Neuter()");
ENTER_V8(isolate);
- i::Runtime::NeuterArrayBuffer(obj);
+
+ for (i::Handle<i::Object> view_obj(obj->weak_first_view(), isolate);
+ !view_obj->IsUndefined();) {
+ i::Handle<i::JSArrayBufferView>
view(i::JSArrayBufferView::cast(*view_obj));
+ if (view->IsJSTypedArray()) {
+ i::JSTypedArray::cast(*view)->Neuter();
+ } else if (view->IsJSDataView()) {
+ i::JSDataView::cast(*view)->Neuter();
+ } else {
+ UNREACHABLE();
+ }
+ view_obj = i::handle(view->weak_next(), isolate);
+ }
+ obj->Neuter();
}
=======================================
--- /branches/bleeding_edge/src/arraybuffer.js Tue Mar 18 10:23:50 2014 UTC
+++ /branches/bleeding_edge/src/arraybuffer.js Tue Mar 18 10:50:00 2014 UTC
@@ -56,9 +56,6 @@
}
var relativeStart = TO_INTEGER(start);
- if (!IS_UNDEFINED(end)) {
- end = TO_INTEGER(end);
- }
var first;
var byte_length = %ArrayBufferGetByteLength(this);
if (relativeStart < 0) {
@@ -66,7 +63,7 @@
} else {
first = MathMin(relativeStart, byte_length);
}
- var relativeEnd = IS_UNDEFINED(end) ? byte_length : end;
+ var relativeEnd = IS_UNDEFINED(end) ? byte_length : TO_INTEGER(end);
var fin;
if (relativeEnd < 0) {
fin = MathMax(byte_length + relativeEnd, 0);
=======================================
--- /branches/bleeding_edge/src/runtime.cc Tue Mar 18 10:23:50 2014 UTC
+++ /branches/bleeding_edge/src/runtime.cc Tue Mar 18 10:50:00 2014 UTC
@@ -789,24 +789,6 @@
return true;
}
-
-
-void Runtime::NeuterArrayBuffer(Handle<JSArrayBuffer> array_buffer) {
- Isolate* isolate = array_buffer->GetIsolate();
- for (Handle<Object> view_obj(array_buffer->weak_first_view(), isolate);
- !view_obj->IsUndefined();) {
- Handle<JSArrayBufferView> view(JSArrayBufferView::cast(*view_obj));
- if (view->IsJSTypedArray()) {
- JSTypedArray::cast(*view)->Neuter();
- } else if (view->IsJSDataView()) {
- JSDataView::cast(*view)->Neuter();
- } else {
- UNREACHABLE();
- }
- view_obj = handle(view->weak_next(), isolate);
- }
- array_buffer->Neuter();
-}
RUNTIME_FUNCTION(MaybeObject*, Runtime_ArrayBufferInitialize) {
@@ -862,9 +844,7 @@
if (target_length == 0) return isolate->heap()->undefined_value();
- size_t source_byte_length = NumberToSize(isolate, source->byte_length());
- CHECK(start <= source_byte_length);
- CHECK(source_byte_length - start >= target_length);
+ ASSERT(NumberToSize(isolate, source->byte_length()) - target_length >=
start);
uint8_t* source_data =
reinterpret_cast<uint8_t*>(source->backing_store());
uint8_t* target_data =
reinterpret_cast<uint8_t*>(target->backing_store());
CopyBytes(target_data, source_data + start, target_length);
@@ -880,19 +860,6 @@
? isolate->heap()->true_value()
: isolate->heap()->false_value();
}
-
-
-RUNTIME_FUNCTION(MaybeObject*, Runtime_ArrayBufferNeuter) {
- HandleScope scope(isolate);
- CONVERT_ARG_HANDLE_CHECKED(JSArrayBuffer, array_buffer, 0);
- ASSERT(!array_buffer->is_external());
- void* backing_store = array_buffer->backing_store();
- size_t byte_length = NumberToSize(isolate, array_buffer->byte_length());
- array_buffer->set_is_external(true);
- Runtime::NeuterArrayBuffer(array_buffer);
- V8::ArrayBufferAllocator()->Free(backing_store, byte_length);
- return isolate->heap()->undefined_value();
-}
void Runtime::ArrayIdToTypeAndSize(
@@ -938,12 +905,7 @@
size_t byte_offset = NumberToSize(isolate, *byte_offset_object);
size_t byte_length = NumberToSize(isolate, *byte_length_object);
- size_t array_buffer_byte_length =
- NumberToSize(isolate, buffer->byte_length());
- CHECK(byte_offset <= array_buffer_byte_length);
- CHECK(array_buffer_byte_length - byte_offset >= byte_length);
-
- CHECK_EQ(0, byte_length % element_size);
+ ASSERT(byte_length % element_size == 0);
size_t length = byte_length / element_size;
if (length > static_cast<unsigned>(Smi::kMaxValue)) {
=======================================
--- /branches/bleeding_edge/src/runtime.h Tue Mar 18 10:23:50 2014 UTC
+++ /branches/bleeding_edge/src/runtime.h Tue Mar 18 10:50:00 2014 UTC
@@ -365,7 +365,6 @@
F(ArrayBufferGetByteLength, 1, 1)\
F(ArrayBufferSliceImpl, 3, 1) \
F(ArrayBufferIsView, 1, 1) \
- F(ArrayBufferNeuter, 1, 1) \
\
F(TypedArrayInitialize, 5, 1) \
F(TypedArrayInitializeFromArrayLike, 4, 1) \
@@ -829,8 +828,6 @@
size_t allocated_length,
bool initialize = true);
- static void NeuterArrayBuffer(Handle<JSArrayBuffer> array_buffer);
-
static void FreeArrayBuffer(
Isolate* isolate,
JSArrayBuffer* phantom_array_buffer);
=======================================
--- /branches/bleeding_edge/src/typedarray.js Tue Mar 18 10:23:50 2014 UTC
+++ /branches/bleeding_edge/src/typedarray.js Tue Mar 18 10:50:00 2014 UTC
@@ -49,20 +49,12 @@
macro TYPED_ARRAY_CONSTRUCTOR(ARRAY_ID, NAME, ELEMENT_SIZE)
function NAMEConstructByArrayBuffer(obj, buffer, byteOffset, length) {
- if (!IS_UNDEFINED(byteOffset)) {
- byteOffset =
- ToPositiveInteger(byteOffset, "invalid_typed_array_length");
- }
- if (!IS_UNDEFINED(length)) {
- length = ToPositiveInteger(length, "invalid_typed_array_length");
- }
-
var bufferByteLength = %ArrayBufferGetByteLength(buffer);
var offset;
if (IS_UNDEFINED(byteOffset)) {
offset = 0;
} else {
- offset = byteOffset;
+ offset = ToPositiveInteger(byteOffset, "invalid_typed_array_length");
if (offset % ELEMENT_SIZE !== 0) {
throw MakeRangeError("invalid_typed_array_alignment",
@@ -83,7 +75,7 @@
newByteLength = bufferByteLength - offset;
newLength = newByteLength / ELEMENT_SIZE;
} else {
- var newLength = length;
+ var newLength =
ToPositiveInteger(length, "invalid_typed_array_length");
newByteLength = newLength * ELEMENT_SIZE;
}
if ((offset + newByteLength > bufferByteLength)
@@ -107,7 +99,6 @@
function NAMEConstructByArrayLike(obj, arrayLike) {
var length = arrayLike.length;
var l = ToPositiveInteger(length, "invalid_typed_array_length");
-
if (l > %MaxSmi()) {
throw MakeRangeError("invalid_typed_array_length");
}
@@ -157,19 +148,15 @@
function CreateSubArray(elementSize, constructor) {
return function(begin, end) {
+ var srcLength = %TypedArrayGetLength(this);
var beginInt = TO_INTEGER(begin);
- if (!IS_UNDEFINED(end)) {
- end = TO_INTEGER(end);
- }
-
- var srcLength = %TypedArrayGetLength(this);
if (beginInt < 0) {
beginInt = MathMax(0, srcLength + beginInt);
} else {
beginInt = MathMin(srcLength, beginInt);
}
- var endInt = IS_UNDEFINED(end) ? srcLength : end;
+ var endInt = IS_UNDEFINED(end) ? srcLength : TO_INTEGER(end);
if (endInt < 0) {
endInt = MathMax(0, srcLength + endInt);
} else {
@@ -330,23 +317,14 @@
if (!IS_ARRAYBUFFER(buffer)) {
throw MakeTypeError('data_view_not_array_buffer', []);
}
- if (!IS_UNDEFINED(byteOffset)) {
- byteOffset =
ToPositiveInteger(byteOffset, 'invalid_data_view_offset');
- }
- if (!IS_UNDEFINED(byteLength)) {
- byteLength = TO_INTEGER(byteLength);
- }
-
var bufferByteLength = %ArrayBufferGetByteLength(buffer);
-
- var offset = IS_UNDEFINED(byteOffset) ? 0 : byteOffset;
+ var offset = IS_UNDEFINED(byteOffset) ?
+ 0 : ToPositiveInteger(byteOffset, 'invalid_data_view_offset');
if (offset > bufferByteLength) {
throw MakeRangeError('invalid_data_view_offset');
}
-
- var length = IS_UNDEFINED(byteLength)
- ? bufferByteLength - offset
- : byteLength;
+ var length = IS_UNDEFINED(byteLength) ?
+ bufferByteLength - offset : TO_INTEGER(byteLength);
if (length < 0 || offset + length > bufferByteLength) {
throw new MakeRangeError('invalid_data_view_length');
}
--
--
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.
