stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8181191: getUint32 returning Long

Browse Source 
Reviewed-by: attila, jlaskey
This commit is contained in:
Hannes Wallnöfer 2017-06-14 10:07:07 +02:00
parent ed22483411
commit 5d12a182d4
2 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java
View File

@ -416,7 +416,7 @@ public class NativeDataView extends ScriptObject {
* @return 32-bit unsigned int value at the byteOffset
*/
@Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
public static long getUint32(final Object self, final Object byteOffset, final Object littleEndian) {
public static double getUint32(final Object self, final Object byteOffset, final Object littleEndian) {
try {
return 0xFFFFFFFFL & getBuffer(self, littleEndian).getInt(JSType.toInt32(byteOffset));
} catch (final IllegalArgumentException iae) {
@ -432,7 +432,7 @@ public class NativeDataView extends ScriptObject {
* @return 32-bit unsigned int value at the byteOffset
*/
@SpecializedFunction
public static long getUint32(final Object self, final int byteOffset) {
public static double getUint32(final Object self, final int byteOffset) {
try {
return JSType.toUint32(getBuffer(self, false).getInt(JSType.toInt32(byteOffset)));
} catch (final IllegalArgumentException iae) {
@ -449,7 +449,7 @@ public class NativeDataView extends ScriptObject {
* @return 32-bit unsigned int value at the byteOffset
*/
@SpecializedFunction
public static long getUint32(final Object self, final int byteOffset, final boolean littleEndian) {
public static double getUint32(final Object self, final int byteOffset, final boolean littleEndian) {
try {
return JSType.toUint32(getBuffer(self, littleEndian).getInt(JSType.toInt32(byteOffset)));
} catch (final IllegalArgumentException iae) {
@ -837,9 +837,9 @@ public class NativeDataView extends ScriptObject {
* @return undefined
*/
@SpecializedFunction
public static Object setUint32(final Object self, final int byteOffset, final long value) {
public static Object setUint32(final Object self, final int byteOffset, final double value) {
try {
getBuffer(self, false).putInt(byteOffset, (int)value);
getBuffer(self, false).putInt(byteOffset, (int) JSType.toUint32(value));
return UNDEFINED;
} catch (final IllegalArgumentException iae) {
throw rangeError(iae, "dataview.offset");
@ -856,9 +856,9 @@ public class NativeDataView extends ScriptObject {
* @return undefined
*/
@SpecializedFunction
public static Object setUint32(final Object self, final int byteOffset, final long value, final boolean littleEndian) {
public static Object setUint32(final Object self, final int byteOffset, final double value, final boolean littleEndian) {
try {
getBuffer(self, littleEndian).putInt(byteOffset, (int)value);
getBuffer(self, littleEndian).putInt(byteOffset, (int) JSType.toUint32(value));
return UNDEFINED;
} catch (final IllegalArgumentException iae) {
throw rangeError(iae, "dataview.offset");

52
nashorn/test/script/basic/JDK-8181191.js Normal file
View File

@ -0,0 +1,52 @@
/*
* 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-8181191: getUint32 returning Long
*
* @test
* @run
*/
function uint32(x) {
var buffer = new ArrayBuffer(16);
var dataview = new DataView(buffer);
dataview.setUint32(0, x);
return dataview.getUint32(0);
}
Assert.assertTrue(typeof uint32(0x7f) === 'number');
Assert.assertTrue(typeof uint32(0x80) === 'number');
Assert.assertTrue(typeof uint32(0xffffffff) === 'number');
Assert.assertTrue(typeof uint32(0x100000000) === 'number');
Assert.assertTrue(uint32(0x7f) === 0x7f);
Assert.assertTrue(uint32(0x80) === 0x80);
Assert.assertTrue(uint32(0xffffffff) === 0xffffffff);
Assert.assertTrue(uint32(0x100000000) === 0x0);
Assert.assertTrue(uint32(0x7f) === uint32(0x7f));
Assert.assertTrue(uint32(0x80) === uint32(0x80));
Assert.assertTrue(uint32(0xffffffff) === uint32(0xffffffff));
Assert.assertTrue(uint32(0x100000000) === uint32(0x100000000));