Reviewers: Christian Plesner Hansen, Description: Fix issue 192 by propagating out exceptions from object literal boilerplate creation.
Removed declaration of unused and unimplemented function. Please review this at http://codereview.chromium.org/18749 SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/objects.h M src/runtime.cc A test/mjsunit/regress/regress-192.js Index: test/mjsunit/regress/regress-192.js =================================================================== --- test/mjsunit/regress/regress-192.js (revision 0) +++ test/mjsunit/regress/regress-192.js (revision 0) @@ -0,0 +1,38 @@ +// Copyright 2009 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 exceptions are correctly propagated when creating object +// literals. + +// See http://code.google.com/p/v8/issues/detail?id=192 + +Object.prototype.__defineGetter__("x", function() {}); + +// Creating this object literal will throw an exception because we are +// assigning to a property that has only a getter. +assertThrows("({ x: 42 })"); + Index: src/runtime.cc =================================================================== --- src/runtime.cc (revision 1149) +++ src/runtime.cc (working copy) @@ -161,15 +161,16 @@ for (int index = 0; index < length; index +=2) { Handle<Object> key(constant_properties->get(index+0)); Handle<Object> value(constant_properties->get(index+1)); + Handle<Object> result; uint32_t element_index = 0; if (key->IsSymbol()) { // If key is a symbol it is not an array element. Handle<String> name(String::cast(*key)); ASSERT(!name->AsArrayIndex(&element_index)); - SetProperty(boilerplate, name, value, NONE); + result = SetProperty(boilerplate, name, value, NONE); } else if (Array::IndexFromObject(*key, &element_index)) { // Array index (uint32). - SetElement(boilerplate, element_index, value); + result = SetElement(boilerplate, element_index, value); } else { // Non-uint32 number. ASSERT(key->IsNumber()); @@ -178,8 +179,13 @@ Vector<char> buffer(arr, ARRAY_SIZE(arr)); const char* str = DoubleToCString(num, buffer); Handle<String> name = Factory::NewStringFromAscii(CStrVector(str)); - SetProperty(boilerplate, name, value, NONE); + result = SetProperty(boilerplate, name, value, NONE); } + // If setting the property on the boilerplate throws an + // exception, the exception is converted to an empty handle in + // the handle based operations. In that case, we need to + // convert back to an exception. + if (result.is_null()) return Failure::Exception(); } } Index: src/objects.h =================================================================== --- src/objects.h (revision 1149) +++ src/objects.h (working copy) @@ -2965,7 +2965,6 @@ // Dispatched behavior. #ifdef DEBUG - void JSRegExpPrint(); void JSRegExpVerify(); #endif --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
