Correctly load message from an Error object.
R=mstarzinger@chromium.org BUG=306220 Review URL: https://codereview.chromium.org/46593010 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17484 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
ea89d6bd29
commit
a5ed9a71c8
@ -1247,23 +1247,24 @@ var visited_errors = new InternalArray();
|
||||
var cyclic_error_marker = new $Object();
|
||||
|
||||
function GetPropertyWithoutInvokingMonkeyGetters(error, name) {
|
||||
var current = error;
|
||||
// Climb the prototype chain until we find the holder.
|
||||
while (error && !%HasLocalProperty(error, name)) {
|
||||
error = %GetPrototype(error);
|
||||
while (current && !%HasLocalProperty(current, name)) {
|
||||
current = %GetPrototype(current);
|
||||
}
|
||||
if (IS_NULL(error)) return UNDEFINED;
|
||||
if (!IS_OBJECT(error)) return error[name];
|
||||
if (IS_NULL(current)) return UNDEFINED;
|
||||
if (!IS_OBJECT(current)) return error[name];
|
||||
// If the property is an accessor on one of the predefined errors that can be
|
||||
// generated statically by the compiler, don't touch it. This is to address
|
||||
// http://code.google.com/p/chromium/issues/detail?id=69187
|
||||
var desc = %GetOwnProperty(error, name);
|
||||
var desc = %GetOwnProperty(current, name);
|
||||
if (desc && desc[IS_ACCESSOR_INDEX]) {
|
||||
var isName = name === "name";
|
||||
if (error === $ReferenceError.prototype)
|
||||
if (current === $ReferenceError.prototype)
|
||||
return isName ? "ReferenceError" : UNDEFINED;
|
||||
if (error === $SyntaxError.prototype)
|
||||
if (current === $SyntaxError.prototype)
|
||||
return isName ? "SyntaxError" : UNDEFINED;
|
||||
if (error === $TypeError.prototype)
|
||||
if (current === $TypeError.prototype)
|
||||
return isName ? "TypeError" : UNDEFINED;
|
||||
}
|
||||
// Otherwise, read normally.
|
||||
|
38
test/mjsunit/regress/regress-crbug-306220.js
Normal file
38
test/mjsunit/regress/regress-crbug-306220.js
Normal file
@ -0,0 +1,38 @@
|
||||
// Copyright 2013 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.
|
||||
|
||||
var CustomError = function(x) { this.x = x; };
|
||||
CustomError.prototype = new Error();
|
||||
CustomError.prototype.x = "prototype";
|
||||
|
||||
Object.defineProperties(CustomError.prototype, {
|
||||
'message': {
|
||||
'get': function() { return this.x; }
|
||||
}
|
||||
});
|
||||
|
||||
assertEquals("Error: instance", String(new CustomError("instance")));
|
Loading…
Reference in New Issue
Block a user