Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/test/mjsunit/messages.js b/test/mjsunit/messages.js
index 8da7e6b..7deef02 100644
--- a/test/mjsunit/messages.js
+++ b/test/mjsunit/messages.js
@@ -3,7 +3,7 @@
// found in the LICENSE file.
// Flags: --stack-size=100 --harmony --harmony-reflect --harmony-regexps
-// Flags: --harmony-simd --strong-mode
+// Flags: --harmony-simd
function test(f, expected, type) {
try {
@@ -150,7 +150,7 @@
// kInstanceofFunctionExpected
test(function() {
1 instanceof 1;
-}, "Expecting a function in instanceof check, but got 1", TypeError);
+}, "Expecting an object in instanceof check", TypeError);
// kInstanceofNonobjectProto
test(function() {
@@ -305,12 +305,6 @@
(1).a = 1;
}, "Cannot create property 'a' on number '1'", TypeError);
-// kStrongImplicitCast
-test(function() {
- "use strong";
- "a" + 1;
-}, "In strong mode, implicit conversions are deprecated", TypeError);
-
// kSymbolToString
test(function() {
"" + Symbol();
@@ -345,6 +339,26 @@
eval("/a/x.test(\"a\");");
}, "Invalid regular expression flags", SyntaxError);
+//kJsonParseUnexpectedEOS
+test(function() {
+ JSON.parse("{")
+}, "Unexpected end of JSON input", SyntaxError);
+
+// kJsonParseUnexpectedTokenAt
+test(function() {
+ JSON.parse("/")
+}, "Unexpected token / in JSON at position 0", SyntaxError);
+
+// kJsonParseUnexpectedTokenNumberAt
+test(function() {
+ JSON.parse("{ 1")
+}, "Unexpected number in JSON at position 2", SyntaxError);
+
+// kJsonParseUnexpectedTokenStringAt
+test(function() {
+ JSON.parse('"""')
+}, "Unexpected string in JSON at position 2", SyntaxError);
+
// kMalformedRegExp
test(function() {
/(/.test("a");
@@ -355,27 +369,6 @@
new Function(")", "");
}, "Function arg string contains parenthesis", SyntaxError);
-// kUnexpectedEOS
-test(function() {
- JSON.parse("{")
-}, "Unexpected end of input", SyntaxError);
-
-// kUnexpectedToken
-test(function() {
- JSON.parse("/")
-}, "Unexpected token /", SyntaxError);
-
-// kUnexpectedTokenNumber
-test(function() {
- JSON.parse("{ 1")
-}, "Unexpected number", SyntaxError);
-
-// kUnexpectedTokenString
-test(function() {
- JSON.parse('"""')
-}, "Unexpected string", SyntaxError);
-
-
// === ReferenceError ===
// kNotDefined