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

Fix error message wording when instanceof throws.

Browse Source 
R=bmeurer@chromium.org
BUG=82797, v8:1593

Review URL: https://codereview.chromium.org/66463002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17587 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
yangguo@chromium.org 2013-11-08 11:45:56 +00:00
parent e0388823c5
commit 94eb5904a6
5 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime.js
View File

@ -361,7 +361,7 @@ function IN(x) {
function INSTANCE_OF(F) { function INSTANCE_OF(F) {
var V = this; var V = this;
if (!IS_SPEC_FUNCTION(F)) { if (!IS_SPEC_FUNCTION(F)) {
throw %MakeTypeError('instanceof_function_expected', [V]); throw %MakeTypeError('instanceof_function_expected', [F]);
} }
// If V is not an object, return false. // If V is not an object, return false.

28
test/message/instanceof.js Normal file
View File

@ -0,0 +1,28 @@
// 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.
1 instanceof 2;

5
test/message/instanceof.out Normal file
View File

@ -0,0 +1,5 @@
*%(basename)s:28: TypeError: Expecting a function in instanceof check, but got 2
1 instanceof 2;
^
TypeError: Expecting a function in instanceof check, but got 2
at *%(basename)s:28:3

2
test/webkit/exception-for-nonobject-expected.txt
View File

@ -27,7 +27,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS new {}.undefined threw exception TypeError: undefined is not a function. PASS new {}.undefined threw exception TypeError: undefined is not a function.
PASS 1 instanceof {}.undefined threw exception TypeError: Expecting a function in instanceof check, but got 1. PASS 1 instanceof {}.undefined threw exception TypeError: Expecting a function in instanceof check, but got undefined.
PASS successfullyParsed is true PASS successfullyParsed is true
TEST COMPLETE TEST COMPLETE

8
test/webkit/instance-of-immediates-expected.txt
View File

@ -27,11 +27,11 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS (1 instanceof 1) threw exception TypeError: Expecting a function in instanceof check, but got 1. PASS (1 instanceof 1) threw exception TypeError: Expecting a function in instanceof check, but got 1.
PASS ({} instanceof 1) threw exception TypeError: Expecting a function in instanceof check, but got #<Object>. PASS ({} instanceof 1) threw exception TypeError: Expecting a function in instanceof check, but got 1.
PASS (obj instanceof 1) threw exception TypeError: Expecting a function in instanceof check, but got #<Constructor>. PASS (obj instanceof 1) threw exception TypeError: Expecting a function in instanceof check, but got 1.
PASS (1 instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got 1. PASS (1 instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got #<Object>.
PASS ({} instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got #<Object>. PASS ({} instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got #<Object>.
PASS (obj instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got #<Constructor>. PASS (obj instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got #<Object>.
PASS (1 instanceof Constructor) is false PASS (1 instanceof Constructor) is false
PASS ({} instanceof Constructor) is false PASS ({} instanceof Constructor) is false
PASS (obj instanceof Constructor) is true PASS (obj instanceof Constructor) is true