Mercurial > hg > jdk9-shenandoah > nashorn
changeset 1124:f0345e058826
8066232: problem with conditional catch compilation
Reviewed-by: hannesw, lagergren
author | attila |
---|---|
date | Wed, 03 Dec 2014 16:31:39 +0100 |
parents | c065853b25fe |
children | a64d69fb8eb3 |
files | src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java test/script/basic/JDK-8066232.js test/script/basic/JDK-8066232.js.EXPECTED |
diffstat | 3 files changed, 39 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Wed Dec 03 16:31:15 2014 +0100 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Wed Dec 03 16:31:39 2014 +0100 @@ -3080,6 +3080,7 @@ if (isConditionalCatch) { loadExpressionAsBoolean(exceptionCondition); nextCatch = new Label("next_catch"); + nextCatch.markAsBreakTarget(); method.ifeq(nextCatch); } else { nextCatch = null; @@ -3092,7 +3093,7 @@ method._goto(afterCatch); } if(nextCatch != null) { - method.label(nextCatch); + method.breakLabel(nextCatch, lc.getUsedSlotCount()); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8066232.js Wed Dec 03 16:31:39 2014 +0100 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2014 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-8066232: problem with conditional catch compilation + * + * @test + * @run + */ + +(function () { + try { + x; + } catch(e if 1) { + } +})()