AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Removed asserts on attributes when setting elements. Will file a bug on not handling elements correctly when using Object.defineProperty

Browse Source 
Review URL: http://codereview.chromium.org/651025

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3914 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
ricow@chromium.org 2010-02-19 12:16:00 +00:00
parent 469d694d5b
commit 24011207c6
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime.cc
View File

@ -2960,8 +2960,6 @@ Object* Runtime::SetObjectProperty(Handle<Object> object,
// Check if the given key is an array index. // Check if the given key is an array index.
uint32_t index; uint32_t index;
if (Array::IndexFromObject(*key, &index)) { if (Array::IndexFromObject(*key, &index)) {
ASSERT(attr == NONE);
// In Firefox/SpiderMonkey, Safari and Opera you can access the characters // In Firefox/SpiderMonkey, Safari and Opera you can access the characters
// of a string using [] notation. We need to support this too in // of a string using [] notation. We need to support this too in
// JavaScript. // JavaScript.
@ -2981,7 +2979,6 @@ Object* Runtime::SetObjectProperty(Handle<Object> object,
if (key->IsString()) { if (key->IsString()) {
Handle<Object> result; Handle<Object> result;
if (Handle<String>::cast(key)->AsArrayIndex(&index)) { if (Handle<String>::cast(key)->AsArrayIndex(&index)) {
ASSERT(attr == NONE);
result = SetElement(js_object, index, value); result = SetElement(js_object, index, value);
} else { } else {
Handle<String> key_string = Handle<String>::cast(key); Handle<String> key_string = Handle<String>::cast(key);
@ -2999,7 +2996,6 @@ Object* Runtime::SetObjectProperty(Handle<Object> object,
Handle<String> name = Handle<String>::cast(converted); Handle<String> name = Handle<String>::cast(converted);
if (name->AsArrayIndex(&index)) { if (name->AsArrayIndex(&index)) {
ASSERT(attr == NONE);
return js_object->SetElement(index, *value); return js_object->SetElement(index, *value);
} else { } else {
return js_object->SetProperty(*name, *value, attr); return js_object->SetProperty(*name, *value, attr);
@ -3016,8 +3012,6 @@ Object* Runtime::ForceSetObjectProperty(Handle<JSObject> js_object,
// Check if the given key is an array index. // Check if the given key is an array index.
uint32_t index; uint32_t index;
if (Array::IndexFromObject(*key, &index)) { if (Array::IndexFromObject(*key, &index)) {
ASSERT(attr == NONE);
// In Firefox/SpiderMonkey, Safari and Opera you can access the characters // In Firefox/SpiderMonkey, Safari and Opera you can access the characters
// of a string using [] notation. We need to support this too in // of a string using [] notation. We need to support this too in
// JavaScript. // JavaScript.
@ -3034,7 +3028,6 @@ Object* Runtime::ForceSetObjectProperty(Handle<JSObject> js_object,
if (key->IsString()) { if (key->IsString()) {
if (Handle<String>::cast(key)->AsArrayIndex(&index)) { if (Handle<String>::cast(key)->AsArrayIndex(&index)) {
ASSERT(attr == NONE);
return js_object->SetElement(index, *value); return js_object->SetElement(index, *value);
} else { } else {
Handle<String> key_string = Handle<String>::cast(key); Handle<String> key_string = Handle<String>::cast(key);
@ -3052,7 +3045,6 @@ Object* Runtime::ForceSetObjectProperty(Handle<JSObject> js_object,
Handle<String> name = Handle<String>::cast(converted); Handle<String> name = Handle<String>::cast(converted);
if (name->AsArrayIndex(&index)) { if (name->AsArrayIndex(&index)) {
ASSERT(attr == NONE);
return js_object->SetElement(index, *value); return js_object->SetElement(index, *value);
} else { } else {
return js_object->IgnoreAttributesAndSetLocalProperty(*name, *value, attr); return js_object->IgnoreAttributesAndSetLocalProperty(*name, *value, attr);