# HG changeset patch # User sundar # Date 1510755921 -19800 # Node ID 6cc6869999e23da3e83f7bdfbd42750a00db1251 # Parent dfc709c80775eef5078cc18c432656776f979d14 8191306: Math.abs corner case with optimistic typing Reviewed-by: jlaskey, hannesw diff -r dfc709c80775 -r 6cc6869999e2 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java Tue Nov 14 13:44:07 2017 -0800 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java Wed Nov 15 19:55:21 2017 +0530 @@ -105,8 +105,8 @@ * @return abs of argument */ @SpecializedFunction - public static int abs(final Object self, final int x) { - return Math.abs(x); + public static double abs(final Object self, final int x) { + return x == Integer.MIN_VALUE? Math.abs((double)x) : Math.abs(x); } /** diff -r dfc709c80775 -r 6cc6869999e2 test/nashorn/script/basic/JDK-8191306.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/nashorn/script/basic/JDK-8191306.js Wed Nov 15 19:55:21 2017 +0530 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2017, 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-8191306 Math.abs corner case with optimistic typing + * + * @test + * @run + */ + +print(Math.abs(-2147483648)) +print(Math.abs(java.lang.Integer.MIN_VALUE)) diff -r dfc709c80775 -r 6cc6869999e2 test/nashorn/script/basic/JDK-8191306.js.EXPECTED --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/nashorn/script/basic/JDK-8191306.js.EXPECTED Wed Nov 15 19:55:21 2017 +0530 @@ -0,0 +1,2 @@ +2147483648 +2147483648