From a26d44cfc3cc72b2fe8bd935a91c0a87b6a22c8b Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Thu, 30 Oct 2014 02:21:00 +0100
Subject: [PATCH] Bug 1089038 - Do not call peekToken after matchToken failed.
 r=Waldo

---
 js/src/frontend/Parser.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 762e11916314..819ac036d42c 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -709,13 +709,10 @@ Parser<ParseHandler>::parse(JSObject *chain)
 
     Node pn = statements();
     if (pn) {
-        bool matched;
-        if (!tokenStream.matchToken(&matched, TOK_EOF))
+        TokenKind tt;
+        if (!tokenStream.getToken(&tt))
             return null();
-        if (!matched) {
-            TokenKind tt;
-            if (!tokenStream.peekToken(&tt))
-                return null();
+        if (tt != TOK_EOF) {
             report(ParseError, false, null(), JSMSG_GARBAGE_AFTER_INPUT,
                    "script", TokenKindToDesc(tt));
             return null();
@@ -834,13 +831,10 @@ Parser<FullParseHandler>::standaloneFunctionBody(HandleFunction fun, const AutoN
     if (!pn)
         return null();
 
-    bool matched;
-    if (!tokenStream.matchToken(&matched, TOK_EOF))
+    TokenKind tt;
+    if (!tokenStream.getToken(&tt))
         return null();
-    if (!matched) {
-        TokenKind tt;
-        if (!tokenStream.peekToken(&tt))
-            return null();
+    if (tt != TOK_EOF) {
         report(ParseError, false, null(), JSMSG_GARBAGE_AFTER_INPUT,
                "function body", TokenKindToDesc(tt));
         return null();