Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/parser/Parser.java	Thu Feb 14 11:32:49 2013 -0400
     1.2 +++ b/src/jdk/nashorn/internal/parser/Parser.java	Fri Feb 15 09:18:05 2013 +0100
     1.3 @@ -1742,6 +1742,10 @@
     1.4          // TRY tested in caller.
     1.5          next();
     1.6  
     1.7 +        // Container block needed to act as target for labeled break statements
     1.8 +        final Block outer = newBlock();
     1.9 +        pushControlNode(outer);
    1.10 +
    1.11          // Create try.
    1.12          final TryNode tryNode = new TryNode(source, tryToken, Token.descPosition(tryToken), findControl(TryNode.class));
    1.13          pushControlNode(tryNode);
    1.14 @@ -1819,12 +1823,17 @@
    1.15              tryNode.setCatchBlocks(catchBlocks);
    1.16              tryNode.setFinallyBody(finallyStatements);
    1.17              tryNode.setFinish(finish);
    1.18 +            outer.setFinish(finish);
    1.19  
    1.20              // Add try.
    1.21 -            block.addStatement(tryNode);
    1.22 +            outer.addStatement(tryNode);
    1.23          } finally {
    1.24              popControlNode(tryNode);
    1.25 +            restoreBlock();
    1.26 +            popControlNode(outer);
    1.27          }
    1.28 +
    1.29 +        block.addStatement(new ExecuteNode(source, outer.getToken(), outer.getFinish(), outer));
    1.30      }
    1.31  
    1.32      /**

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8008215.js	Fri Feb 15 09:18:05 2013 +0100
     2.3 @@ -0,0 +1,41 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8008215 : break in catch clause causes java.lang.VerifyError: Inconsistent stackmap
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +a: try {
    2.35 +    print("try");
    2.36 +    throw new Error();
    2.37 +} catch (e) {
    2.38 +    print("catch");
    2.39 +    break a;
    2.40 +    print("error");
    2.41 +} finally {
    2.42 +    print("finally");
    2.43 +}
    2.44 +print("done");

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8008215.js.EXPECTED	Fri Feb 15 09:18:05 2013 +0100
     3.3 @@ -0,0 +1,4 @@
     3.4 +try
     3.5 +catch
     3.6 +finally
     3.7 +done