Reviewers: Lasse Reichstein Nielsen, Message: On 2012/02/02 10:05:18, Lasse Reichstein Nielsen wrote:
Consider adding a test for this.
https://chromiumcodereview.appspot.com/9159043/diff/1/src/parser.cc File src/parser.cc (right):
https://chromiumcodereview.appspot.com/9159043/diff/1/src/parser.cc#newcode2134
src/parser.cc:2134: } The semicolon *must* be there (or be inserted by automatic semicolon
insertion),
so use ExpectSemicolon(CHECK_OK); like below. Otherwise it'll still match something like foo: break foo var x = 10;
Corrected and test case included. Description: Fix handling of 'c: if (0) break c; else ()' where a parser optimization leaves a trailing ";" after removing the break. Please review this at https://chromiumcodereview.appspot.com/9159043/ SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/parser.cc A test/mjsunit/regress/regress-1924.js Index: src/parser.cc =================================================================== --- src/parser.cc (revision 10553) +++ src/parser.cc (working copy) @@ -2128,6 +2128,7 @@ // Parse labeled break statements that target themselves into // empty statements, e.g. 'l1: l2: l3: break l2;' if (!label.is_null() && ContainsLabel(labels, label)) { + ExpectSemicolon(CHECK_OK); return EmptyStatement(); } BreakableStatement* target = NULL; Index: test/mjsunit/regress/regress-1924.js =================================================================== --- test/mjsunit/regress/regress-1924.js (revision 0) +++ test/mjsunit/regress/regress-1924.js (revision 0) @@ -0,0 +1,41 @@ +// Copyright 2012 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. + +// For http://code.google.com/p/v8/issues/detail?id=1924 + +a: break a; +a: b: break a; +a: b: break b; +assertThrows("a: break a a",SyntaxError) +assertThrows("a: break a 1",SyntaxError) +assertThrows("a: break a ''",SyntaxError) +assertThrows("a: break a var",SyntaxError) +assertThrows("a: break a {}",SyntaxError) + +a: if (0) break a; +b: if (0) {break b;} else {} +c: if (0) break c; else {} -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
