Mercurial > hg > openjdk > jigsaw > nashorn
changeset 94:36065e5ea3d1
8008215: break in catch clause causes java.lang.VerifyError: Inconsistent stackmap
Reviewed-by: jlaskey, lagergren
| author | hannesw |
|---|---|
| date | Fri, 15 Feb 2013 09:18:05 +0100 |
| parents | d41d7cf9ab8b |
| children | e478708faa22 |
| files | src/jdk/nashorn/internal/parser/Parser.java test/script/basic/JDK-8008215.js test/script/basic/JDK-8008215.js.EXPECTED |
| diffstat | 3 files changed, 55 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/parser/Parser.java Thu Feb 14 11:32:49 2013 -0400 +++ b/src/jdk/nashorn/internal/parser/Parser.java Fri Feb 15 09:18:05 2013 +0100 @@ -1742,6 +1742,10 @@ // TRY tested in caller. next(); + // Container block needed to act as target for labeled break statements + final Block outer = newBlock(); + pushControlNode(outer); + // Create try. final TryNode tryNode = new TryNode(source, tryToken, Token.descPosition(tryToken), findControl(TryNode.class)); pushControlNode(tryNode); @@ -1819,12 +1823,17 @@ tryNode.setCatchBlocks(catchBlocks); tryNode.setFinallyBody(finallyStatements); tryNode.setFinish(finish); + outer.setFinish(finish); // Add try. - block.addStatement(tryNode); + outer.addStatement(tryNode); } finally { popControlNode(tryNode); + restoreBlock(); + popControlNode(outer); } + + block.addStatement(new ExecuteNode(source, outer.getToken(), outer.getFinish(), outer)); } /**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8008215.js Fri Feb 15 09:18:05 2013 +0100 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8008215 : break in catch clause causes java.lang.VerifyError: Inconsistent stackmap + * + * @test + * @run + */ + +a: try { + print("try"); + throw new Error(); +} catch (e) { + print("catch"); + break a; + print("error"); +} finally { + print("finally"); +} +print("done");