Revision: 15503
Author: [email protected]
Date: Fri Jul 5 01:34:31 2013
Log: Tweak error message
[email protected]
BUG=v8:2758
Review URL: https://codereview.chromium.org/18759002
http://code.google.com/p/v8/source/detail?r=15503
Added:
/branches/bleeding_edge/test/mjsunit/bugs/bug-2758.js
Modified:
/branches/bleeding_edge/src/ia32/full-codegen-ia32.cc
/branches/bleeding_edge/src/messages.js
/branches/bleeding_edge/src/runtime.js
/branches/bleeding_edge/test/mjsunit/function-call.js
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/bugs/bug-2758.js Fri Jul 5
01:34:31 2013
@@ -0,0 +1,49 @@
+// 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.
+
+// Flags: --allow-natives-syntax
+
+var functions = [
+ function() { var f = [].concat; f() },
+ function() { var f = [].push; f() },
+ function() { var f = [].shift; f() },
+ function() { (0, [].concat)() },
+ function() { (0, [].push)() },
+ function() { (0, [].shift)() }
+]
+
+for (var i = 0; i < 5; ++i) {
+ for (var j in functions) {
+ print(functions[i])
+ assertThrows(functions[j], TypeError)
+ }
+
+ if (i === 3) {
+ for (var j in functions)
+ %OptimizeFunctionOnNextCall(functions[j]);
+ }
+}
=======================================
--- /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Wed Jul 3
12:57:25 2013
+++ /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Fri Jul 5
01:34:31 2013
@@ -107,6 +107,7 @@
// formal parameter count expected by the function.
//
// The live registers are:
+// o ecx: CallKind
// o edi: the JS function object being called (i.e. ourselves)
// o esi: our context
// o ebp: our caller's frame pointer
=======================================
--- /branches/bleeding_edge/src/messages.js Thu Jun 27 00:42:08 2013
+++ /branches/bleeding_edge/src/messages.js Fri Jul 5 01:34:31 2013
@@ -73,7 +73,7 @@
invalid_in_operator_use: ["Cannot use 'in' operator to search
for '", "%0", "' in ", "%1"],
instanceof_function_expected: ["Expecting a function in instanceof
check, but got ", "%0"],
instanceof_nonobject_proto: ["Function has non-object
prototype '", "%0", "' in instanceof check"],
- null_to_object: ["Cannot convert null to object"],
+ undefined_or_null_to_object: ["Cannot convert undefined or null to
object"],
reduce_no_initial: ["Reduce of empty array with no initial
value"],
getter_must_be_callable: ["Getter must be a function: ", "%0"],
setter_must_be_callable: ["Setter must be a function: ", "%0"],
=======================================
--- /branches/bleeding_edge/src/runtime.js Mon Jun 24 06:58:52 2013
+++ /branches/bleeding_edge/src/runtime.js Fri Jul 5 01:34:31 2013
@@ -587,7 +587,7 @@
if (IS_NUMBER(x)) return new $Number(x);
if (IS_BOOLEAN(x)) return new $Boolean(x);
if (IS_NULL_OR_UNDEFINED(x) && !IS_UNDETECTABLE(x)) {
- throw %MakeTypeError('null_to_object', []);
+ throw %MakeTypeError('undefined_or_null_to_object', []);
}
return x;
}
=======================================
--- /branches/bleeding_edge/test/mjsunit/function-call.js Wed Jul 3
08:33:11 2013
+++ /branches/bleeding_edge/test/mjsunit/function-call.js Fri Jul 5
01:34:31 2013
@@ -151,8 +151,8 @@
function checkExpectedMessage(e) {
assertTrue(e.message.indexOf("called on null or undefined") >= 0 ||
- e.message.indexOf("invoked on undefined or null value") >= 0 |
|
- e.message.indexOf("Cannot convert null to object") >= 0);
+ e.message.indexOf("invoked on undefined or null value") >= 0 ||
+ e.message.indexOf("Cannot convert undefined or null to object") >=
0);
}
// Test that all natives using the ToObject call throw the right exception.
--
--
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.
