Mercurial > hg > openjdk > lambda > nashorn
changeset 629:062579f50371
8026317: $ in the function name results in wrong function being invoked
Reviewed-by: lagergren, jlaskey
| author | sundar |
|---|---|
| date | Fri, 11 Oct 2013 14:11:14 +0200 |
| parents | fb091f9052a6 |
| children | b35d175207f6 6cb4f20d971f |
| files | src/jdk/nashorn/internal/codegen/Namespace.java test/script/basic/JDK-8026317.js test/script/basic/JDK-8026317.js.EXPECTED |
| diffstat | 3 files changed, 66 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/codegen/Namespace.java Fri Oct 11 11:15:59 2013 +0200 +++ b/src/jdk/nashorn/internal/codegen/Namespace.java Fri Oct 11 14:11:14 2013 +0200 @@ -81,7 +81,7 @@ final int count = counter + 1; namespaceDirectory.put(base, count); - return base + "$" + count; + return base + '-' + count; } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8026317.js Fri Oct 11 14:11:14 2013 +0200 @@ -0,0 +1,63 @@ +/* + * 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-8026317: $ in the function name results in wrong function being invoked + * + * @test + * @run + */ + +function case1() { + function g() { + return 0 + } + function g() { + return 1 + } + function g$1() { + return 2 + } + + return g$1() +} + +print(case1()); + +function case2() { + function g() { + return 0 + } + + var h = function g() { + return 1 + } + + function g$1() { + return 2 + } + + return h() +} + +print(case2());