1089038 - Do not call peekToken after matchToken failed in frontend/Parser.cpp

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Tooru Fujisawa (away) [:arai]]

Derived from bug 1066827 comment #43

http://dxr.mozilla.org/mozilla-central/source/js/src/frontend/Parser.cpp#700
>        if (!tokenStream.matchToken(TOK_EOF)) {
>            report(ParseError, false, null(), JSMSG_GARBAGE_AFTER_INPUT,
>                   "script", TokenKindToDesc(tokenStream.peekToken()));
>            return null();
>        }

http://dxr.mozilla.org/mozilla-central/source/js/src/frontend/Parser.cpp#819
>    if (!tokenStream.matchToken(TOK_EOF)) {
>        report(ParseError, false, null(), JSMSG_GARBAGE_AFTER_INPUT,
>               "function body", TokenKindToDesc(tokenStream.peekToken()));
>        return null();
>    }

They should be getToken.

NOTE: those code will be changed soon by bug 1066827, so the patch should be written after it was fixed.

Comment 1

[Tooru Fujisawa (away) [:arai]]

Attachment: Do not call peekToken after matchToken failed.

Replaced matchToken + peekToken with getToken.
I guess ungetToken is not required there.

Green on try run: https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=ca52cfbf435c

Comment 2

[Tooru Fujisawa (away) [:arai]]

Thank you!

Comment 3

[Jeff Walden [:Waldo]]

(In reply to Tooru Fujisawa [:arai] from comment #2)
> Thank you!

https://twitter.com/sayrer/status/19304989209

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/a8538652ffa3

Comment 5

[Carsten Book [:Tomcat]]

(In reply to Jeff Walden [:Waldo] (remove +bmo to email) from comment #3)
> (In reply to Tooru Fujisawa [:arai] from comment #2)
> > Thank you!
> 
> https://twitter.com/sayrer/status/19304989209

Lol, thanks Waldo, nearly forgot about that one :)

Comment 6

[Jeff Walden [:Waldo]]

(In reply to Carsten Book [:Tomcat] from comment #5)
> Lol, thanks Waldo, nearly forgot about that one :)

Rest assured that I have not.  :-D

$ ack --no-filename --count 19304989209 ~/.chatzilla/*.default/chatzilla/logs/
24

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/a8538652ffa3