Mercurial > hg > openjdk > lambda > nashorn
changeset 605:8c326f8c6799
8026033: Switch should load expression even when there are no cases in it
Reviewed-by: jlaskey, hannesw
| author | sundar |
|---|---|
| date | Tue, 08 Oct 2013 13:02:39 +0200 |
| parents | 6345d08fd5de |
| children | 025e2ff9e91b |
| files | src/jdk/nashorn/internal/codegen/CodeGenerator.java test/script/basic/JDK-8026033.js test/script/basic/JDK-8026033.js.EXPECTED |
| diffstat | 3 files changed, 42 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java Tue Oct 08 11:55:19 2013 +0200 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java Tue Oct 08 13:02:39 2013 +0200 @@ -1827,6 +1827,8 @@ } if (cases.isEmpty()) { + // still evaluate expression for side-effects. + load(expression).pop(); method.label(breakLabel); return false; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8026033.js Tue Oct 08 13:02:39 2013 +0200 @@ -0,0 +1,39 @@ +/* + * 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-8026033: Switch should load expression even when there are no cases in it + * + * @test + * @run + */ + +try { + (function() { switch(x) {} })(); + fail("Should have thrown ReferenceError"); +} catch (e) { + if (! (e instanceof ReferenceError)) { + fail("ReferenceError expected, got " + e); + } + print(e); +}