From 64da4fd7f6e1ac047c508ad92277532e89335b88 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 27 Oct 2011 01:53:05 +0100
Subject: [PATCH] Backout changeset d5cc34a9351d (bug 696109) for jsreftest
 orange

---
 js/src/jsreflect.cpp                           |  6 +++---
 js/src/tests/js1_8_5/extensions/jstests.list   |  1 -
 .../tests/js1_8_5/extensions/regress-696109.js | 18 ------------------
 3 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 js/src/tests/js1_8_5/extensions/regress-696109.js

diff --git a/js/src/jsreflect.cpp b/js/src/jsreflect.cpp
index 024b2c25ff4..47f66e45680 100644
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -2157,9 +2157,9 @@ ASTSerializer::statement(ParseNode *pn, Value *dst)
 
         return expression(pn->pn_left, &expr) &&
                statement(pn->pn_right, &stmt) &&
-               (pn->isKind(TOK_WITH)
-                ? builder.withStatement(expr, stmt, &pn->pn_pos, dst)
-                : builder.whileStatement(expr, stmt, &pn->pn_pos, dst));
+               pn->isKind(TOK_WITH)
+               ? builder.withStatement(expr, stmt, &pn->pn_pos, dst)
+               : builder.whileStatement(expr, stmt, &pn->pn_pos, dst);
       }
 
       case TOK_DO:
diff --git a/js/src/tests/js1_8_5/extensions/jstests.list b/js/src/tests/js1_8_5/extensions/jstests.list
index c45fbbece60..8560741134a 100644
--- a/js/src/tests/js1_8_5/extensions/jstests.list
+++ b/js/src/tests/js1_8_5/extensions/jstests.list
@@ -58,6 +58,5 @@ require-or(debugMode,skip) script regress-672804-2.js
 require-or(debugMode,skip) script regress-672804-3.js
 skip-if(!xulRuntime.shell) script regress-677589.js
 script regress-677924.js
-script regress-696109.js
 script regress-691746.js
 script regress-697515.js
diff --git a/js/src/tests/js1_8_5/extensions/regress-696109.js b/js/src/tests/js1_8_5/extensions/regress-696109.js
deleted file mode 100644
index ca61ca057b7..00000000000
--- a/js/src/tests/js1_8_5/extensions/regress-696109.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Dave Herman <dherman@mozilla.com>
- */
-
-// Bug 696109 - fixed a precedence bug in with/while nodes
-try {
-    Reflect.parse("with({foo})bar");
-    throw new Error("supposed to be a syntax error");
-} catch (e if e instanceof SyntaxError) { }
-try {
-    Reflect.parse("while({foo})bar");
-    throw new Error("supposed to be a syntax error");
-} catch (e if e instanceof SyntaxError) { }
-
-reportCompare(true, true);