From 94eb5904a6618e78048e7fae3eadc7454ab35984 Mon Sep 17 00:00:00 2001 From: "yangguo@chromium.org" Date: Fri, 8 Nov 2013 11:45:56 +0000 Subject: [PATCH] Fix error message wording when instanceof throws. 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 --- src/runtime.js | 2 +- test/message/instanceof.js | 28 +++++++++++++++++++ test/message/instanceof.out | 5 ++++ .../exception-for-nonobject-expected.txt | 2 +- .../instance-of-immediates-expected.txt | 8 +++--- 5 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 test/message/instanceof.js create mode 100644 test/message/instanceof.out diff --git a/src/runtime.js b/src/runtime.js index ce11c37079..875b6b0405 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -361,7 +361,7 @@ function IN(x) { function INSTANCE_OF(F) { var V = this; 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. diff --git a/test/message/instanceof.js b/test/message/instanceof.js new file mode 100644 index 0000000000..1d55e0f94e --- /dev/null +++ b/test/message/instanceof.js @@ -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; diff --git a/test/message/instanceof.out b/test/message/instanceof.out new file mode 100644 index 0000000000..d279bc44e7 --- /dev/null +++ b/test/message/instanceof.out @@ -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 diff --git a/test/webkit/exception-for-nonobject-expected.txt b/test/webkit/exception-for-nonobject-expected.txt index 86068b102c..e6003986b9 100644 --- a/test/webkit/exception-for-nonobject-expected.txt +++ b/test/webkit/exception-for-nonobject-expected.txt @@ -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 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 TEST COMPLETE diff --git a/test/webkit/instance-of-immediates-expected.txt b/test/webkit/instance-of-immediates-expected.txt index a6f6cc5072..db58f00d30 100644 --- a/test/webkit/instance-of-immediates-expected.txt +++ b/test/webkit/instance-of-immediates-expected.txt @@ -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 ({} instanceof 1) threw exception TypeError: Expecting a function in instanceof check, but got #. -PASS (obj instanceof 1) threw exception TypeError: Expecting a function in instanceof check, but got #. -PASS (1 instanceof {}) 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 1. +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 #. PASS ({} instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got #. -PASS (obj instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got #. +PASS (obj instanceof {}) threw exception TypeError: Expecting a function in instanceof check, but got #. PASS (1 instanceof Constructor) is false PASS ({} instanceof Constructor) is false PASS (obj instanceof Constructor) is true