Revision: 17587
Author: [email protected]
Date: Fri Nov 8 11:45:56 2013 UTC
Log: Fix error message wording when instanceof throws.
[email protected]
BUG=82797, v8:1593
Review URL: https://codereview.chromium.org/66463002
http://code.google.com/p/v8/source/detail?r=17587
Added:
/branches/bleeding_edge/test/message/instanceof.js
/branches/bleeding_edge/test/message/instanceof.out
Modified:
/branches/bleeding_edge/src/runtime.js
/branches/bleeding_edge/test/webkit/exception-for-nonobject-expected.txt
/branches/bleeding_edge/test/webkit/instance-of-immediates-expected.txt
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/message/instanceof.js Fri Nov 8 11:45:56
2013 UTC
@@ -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;
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/message/instanceof.out Fri Nov 8 11:45:56
2013 UTC
@@ -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
=======================================
--- /branches/bleeding_edge/src/runtime.js Thu Oct 17 10:02:45 2013 UTC
+++ /branches/bleeding_edge/src/runtime.js Fri Nov 8 11:45:56 2013 UTC
@@ -361,7 +361,7 @@
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.
=======================================
---
/branches/bleeding_edge/test/webkit/exception-for-nonobject-expected.txt
Thu Jun 27 20:02:04 2013 UTC
+++
/branches/bleeding_edge/test/webkit/exception-for-nonobject-expected.txt
Fri Nov 8 11:45:56 2013 UTC
@@ -27,7 +27,7 @@
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
=======================================
--- /branches/bleeding_edge/test/webkit/instance-of-immediates-expected.txt
Thu Jun 27 20:02:04 2013 UTC
+++ /branches/bleeding_edge/test/webkit/instance-of-immediates-expected.txt
Fri Nov 8 11:45:56 2013 UTC
@@ -27,11 +27,11 @@
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 (obj instanceof 1) threw exception TypeError: Expecting a function in
instanceof check, but got #<Constructor>.
-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 #<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 ({} instanceof Constructor) is false
PASS (obj instanceof Constructor) is true
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
