Propagate exceptions thrown when setting elements.
Plus use more robust path when formatting messages---work directly with fixed arrays. BUG=v8:1107 TEST=test/mjsunit/getter-in-prototype.js,test/mjsunit/regress/regress-1107.js Review URL: http://codereview.chromium.org/6451004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6689 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
e300c3cccc
commit
0273e8185b
@ -808,6 +808,7 @@ static bool CompileLazyHelper(CompilationInfo* info,
|
|||||||
ClearExceptionFlag flag) {
|
ClearExceptionFlag flag) {
|
||||||
// Compile the source information to a code object.
|
// Compile the source information to a code object.
|
||||||
ASSERT(info->IsOptimizing() || !info->shared_info()->is_compiled());
|
ASSERT(info->IsOptimizing() || !info->shared_info()->is_compiled());
|
||||||
|
ASSERT(!Top::has_pending_exception());
|
||||||
bool result = Compiler::CompileLazy(info);
|
bool result = Compiler::CompileLazy(info);
|
||||||
ASSERT(result != Top::has_pending_exception());
|
ASSERT(result != Top::has_pending_exception());
|
||||||
if (!result && flag == CLEAR_EXCEPTION) Top::clear_pending_exception();
|
if (!result && flag == CLEAR_EXCEPTION) Top::clear_pending_exception();
|
||||||
|
@ -69,10 +69,13 @@ Handle<JSMessageObject> MessageHandler::MakeMessageObject(
|
|||||||
Handle<String> stack_trace,
|
Handle<String> stack_trace,
|
||||||
Handle<JSArray> stack_frames) {
|
Handle<JSArray> stack_frames) {
|
||||||
Handle<String> type_handle = Factory::LookupAsciiSymbol(type);
|
Handle<String> type_handle = Factory::LookupAsciiSymbol(type);
|
||||||
Handle<JSArray> arguments_handle = Factory::NewJSArray(args.length());
|
Handle<FixedArray> arguments_elements =
|
||||||
|
Factory::NewFixedArray(args.length());
|
||||||
for (int i = 0; i < args.length(); i++) {
|
for (int i = 0; i < args.length(); i++) {
|
||||||
SetElement(arguments_handle, i, args[i]);
|
arguments_elements->set(i, *args[i]);
|
||||||
}
|
}
|
||||||
|
Handle<JSArray> arguments_handle =
|
||||||
|
Factory::NewJSArrayWithElements(arguments_elements);
|
||||||
|
|
||||||
int start = 0;
|
int start = 0;
|
||||||
int end = 0;
|
int end = 0;
|
||||||
@ -87,7 +90,7 @@ Handle<JSMessageObject> MessageHandler::MakeMessageObject(
|
|||||||
? Factory::undefined_value()
|
? Factory::undefined_value()
|
||||||
: Handle<Object>::cast(stack_trace);
|
: Handle<Object>::cast(stack_trace);
|
||||||
|
|
||||||
Handle<Object> stack_frames_handle = stack_frames.is_null()
|
Handle<Object> stack_frames_handle = stack_frames.is_null()
|
||||||
? Factory::undefined_value()
|
? Factory::undefined_value()
|
||||||
: Handle<Object>::cast(stack_frames);
|
: Handle<Object>::cast(stack_frames);
|
||||||
|
|
||||||
|
@ -1707,8 +1707,9 @@ void JSObject::LookupCallbackSetterInPrototypes(String* name,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool JSObject::SetElementWithCallbackSetterInPrototypes(uint32_t index,
|
MaybeObject* JSObject::SetElementWithCallbackSetterInPrototypes(uint32_t index,
|
||||||
Object* value) {
|
Object* value,
|
||||||
|
bool* found) {
|
||||||
for (Object* pt = GetPrototype();
|
for (Object* pt = GetPrototype();
|
||||||
pt != Heap::null_value();
|
pt != Heap::null_value();
|
||||||
pt = pt->GetPrototype()) {
|
pt = pt->GetPrototype()) {
|
||||||
@ -1718,15 +1719,16 @@ bool JSObject::SetElementWithCallbackSetterInPrototypes(uint32_t index,
|
|||||||
NumberDictionary* dictionary = JSObject::cast(pt)->element_dictionary();
|
NumberDictionary* dictionary = JSObject::cast(pt)->element_dictionary();
|
||||||
int entry = dictionary->FindEntry(index);
|
int entry = dictionary->FindEntry(index);
|
||||||
if (entry != NumberDictionary::kNotFound) {
|
if (entry != NumberDictionary::kNotFound) {
|
||||||
Object* element = dictionary->ValueAt(entry);
|
|
||||||
PropertyDetails details = dictionary->DetailsAt(entry);
|
PropertyDetails details = dictionary->DetailsAt(entry);
|
||||||
if (details.type() == CALLBACKS) {
|
if (details.type() == CALLBACKS) {
|
||||||
SetElementWithCallback(element, index, value, JSObject::cast(pt));
|
*found = true;
|
||||||
return true;
|
return SetElementWithCallback(
|
||||||
|
dictionary->ValueAt(entry), index, value, JSObject::cast(pt));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
*found = false;
|
||||||
|
return Heap::the_hole_value();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -6969,9 +6971,11 @@ MaybeObject* JSObject::SetFastElement(uint32_t index,
|
|||||||
uint32_t elms_length = static_cast<uint32_t>(elms->length());
|
uint32_t elms_length = static_cast<uint32_t>(elms->length());
|
||||||
|
|
||||||
if (check_prototype &&
|
if (check_prototype &&
|
||||||
(index >= elms_length || elms->get(index)->IsTheHole()) &&
|
(index >= elms_length || elms->get(index)->IsTheHole())) {
|
||||||
SetElementWithCallbackSetterInPrototypes(index, value)) {
|
bool found;
|
||||||
return value;
|
MaybeObject* result =
|
||||||
|
SetElementWithCallbackSetterInPrototypes(index, value, &found);
|
||||||
|
if (found) return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -7103,9 +7107,11 @@ MaybeObject* JSObject::SetElementWithoutInterceptor(uint32_t index,
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Index not already used. Look for an accessor in the prototype chain.
|
// Index not already used. Look for an accessor in the prototype chain.
|
||||||
if (check_prototype &&
|
if (check_prototype) {
|
||||||
SetElementWithCallbackSetterInPrototypes(index, value)) {
|
bool found;
|
||||||
return value;
|
MaybeObject* result =
|
||||||
|
SetElementWithCallbackSetterInPrototypes(index, value, &found);
|
||||||
|
if (found) return result;
|
||||||
}
|
}
|
||||||
// When we set the is_extensible flag to false we always force
|
// When we set the is_extensible flag to false we always force
|
||||||
// the element into dictionary mode (and force them to stay there).
|
// the element into dictionary mode (and force them to stay there).
|
||||||
|
@ -1579,7 +1579,8 @@ class JSObject: public HeapObject {
|
|||||||
void LookupRealNamedProperty(String* name, LookupResult* result);
|
void LookupRealNamedProperty(String* name, LookupResult* result);
|
||||||
void LookupRealNamedPropertyInPrototypes(String* name, LookupResult* result);
|
void LookupRealNamedPropertyInPrototypes(String* name, LookupResult* result);
|
||||||
void LookupCallbackSetterInPrototypes(String* name, LookupResult* result);
|
void LookupCallbackSetterInPrototypes(String* name, LookupResult* result);
|
||||||
bool SetElementWithCallbackSetterInPrototypes(uint32_t index, Object* value);
|
MUST_USE_RESULT MaybeObject* SetElementWithCallbackSetterInPrototypes(
|
||||||
|
uint32_t index, Object* value, bool* found);
|
||||||
void LookupCallback(String* name, LookupResult* result);
|
void LookupCallback(String* name, LookupResult* result);
|
||||||
|
|
||||||
// Returns the number of properties on this object filtering out properties
|
// Returns the number of properties on this object filtering out properties
|
||||||
|
@ -31,9 +31,11 @@
|
|||||||
var o = {};
|
var o = {};
|
||||||
var p = {};
|
var p = {};
|
||||||
p.__defineGetter__('x', function(){});
|
p.__defineGetter__('x', function(){});
|
||||||
|
p.__defineGetter__(0, function(){});
|
||||||
o.__proto__ = p;
|
o.__proto__ = p;
|
||||||
|
|
||||||
assertThrows("o.x = 42");
|
assertThrows("o.x = 42");
|
||||||
|
assertThrows("o[0] = 42");
|
||||||
|
|
||||||
function f() {
|
function f() {
|
||||||
with(o) {
|
with(o) {
|
||||||
@ -48,3 +50,9 @@ function g() {
|
|||||||
x = 42;
|
x = 42;
|
||||||
}
|
}
|
||||||
assertThrows("g()");
|
assertThrows("g()");
|
||||||
|
|
||||||
|
__proto__ = p;
|
||||||
|
function g2() {
|
||||||
|
this[0] = 42;
|
||||||
|
}
|
||||||
|
assertThrows("g2()");
|
||||||
|
32
test/mjsunit/regress/regress-1107.js
Normal file
32
test/mjsunit/regress/regress-1107.js
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
// Copyright 2011 the V8 project authors. All rights reserved.
|
||||||
|
// Redistribution and use in source and binary forms, with or without
|
||||||
|
// modification, are permitted provided that the following conditions are
|
||||||
|
// met:
|
||||||
|
//
|
||||||
|
// * Redistributions of source code must retain the above copyright
|
||||||
|
// notice, this list of conditions and the following disclaimer.
|
||||||
|
// * Redistributions in binary form must reproduce the above
|
||||||
|
// copyright notice, this list of conditions and the following
|
||||||
|
// disclaimer in the documentation and/or other materials provided
|
||||||
|
// with the distribution.
|
||||||
|
// * Neither the name of Google Inc. nor the names of its
|
||||||
|
// contributors may be used to endorse or promote products derived
|
||||||
|
// from this software without specific prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
// Test that even if we cannot set element 0 on all the objects, we still
|
||||||
|
// can format exception messages to some extent.
|
||||||
|
|
||||||
|
Object.prototype.__defineGetter__(0, function(){});
|
||||||
|
assertThrows("x");
|
Loading…
Reference in New Issue
Block a user