Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > nashorn
changeset 1080:dba2a3939f4c
8062381: Wrong index was used for linking charCodeAt specializations
Reviewed-by: attila, hannesw
| author | lagergren |
|---|---|
| date | Mon, 03 Nov 2014 12:34:39 +0100 |
| parents | e1e27c4262be |
| children | 4ac6934c6cc2 |
| files | src/jdk/nashorn/internal/objects/NativeString.java test/script/basic/JDK-8062381.js test/script/basic/JDK-8062381.js.EXPECTED |
| diffstat | 3 files changed, 87 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/objects/NativeString.java Mon Nov 03 11:47:41 2014 +0100 +++ b/src/jdk/nashorn/internal/objects/NativeString.java Mon Nov 03 12:34:39 2014 +0100 @@ -572,7 +572,7 @@ try { return ((CharSequence)self).charAt(pos); } catch (final IndexOutOfBoundsException e) { - throw new ClassCastException(); + throw new ClassCastException(); //invalid char, out of bounds, force relink } } @@ -1389,7 +1389,7 @@ //check that it's a char sequence or throw cce final CharSequence cs = (CharSequence)self; //check that the index, representable as an int, is inside the array - final int intIndex = JSType.toInteger(request.getArguments()[1]); + final int intIndex = JSType.toInteger(request.getArguments()[2]); return intIndex >= 0 && intIndex < cs.length(); //can link } catch (final ClassCastException | IndexOutOfBoundsException e) { //fallthru
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8062381.js Mon Nov 03 12:34:39 2014 +0100 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010, 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-8062381 wrong argument chosen for charCodeAt in linker logic + * + * @test + * @run + */ + +var s = "abcdef"; +var len = s.length + 1; + +function f1() { + for (var i = 0; i < len; i++) { + print(s.charCodeAt(i)); + } + print(s.charCodeAt()); +} + +function f2() { + for (var i = 0; i < len; i++) { + print(s.charCodeAt("" + i)); + } + print(s.charCodeAt()); +} + +f1(); +f2(); +f1(); +f2(); + +