infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-21 20:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

8382267: VectorMathLibrary uses locale-sensitive String.format to construct native symbol names

Browse Source 
Reviewed-by: naoto, liach, vlivanov
This commit is contained in:
Chris Hegarty 2026-04-16 16:19:02 +00:00
parent 8aafaf07e9
commit 0ca24c0e57
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
View File

@ -31,6 +31,7 @@ import jdk.internal.vm.vector.VectorSupport;
import java.lang.foreign.MemorySegment;
import java.lang.foreign.SymbolLookup;
import java.util.Locale;
import java.util.function.IntFunction;
import static jdk.incubator.vector.Util.requires;
@ -141,7 +142,7 @@ import static jdk.internal.vm.vector.Utils.debug;
String elemType = (vspecies.elementType() == float.class ? "f" : "");
boolean isFloatVector64 = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // FloatVector64 or FloatVectorMax
int vlen = (isFloatVector64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
return String.format("__jsvml_%s%s%d_ha_%s", op.operatorName(), elemType, vlen, suffix);
return String.format(Locale.ROOT, "__jsvml_%s%s%d_ha_%s", op.operatorName(), elemType, vlen, suffix);
}
@Override
@ -214,7 +215,7 @@ import static jdk.internal.vm.vector.Utils.debug;
boolean isFloatVector64 = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // FloatVector64 or FloatVectorMax
int vlen = (isFloatVector64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
boolean isShapeAgnostic = isRISCV64() || (isAARCH64() && vspecies.vectorBitSize() > 128);
return String.format("%s%s%s_%s%s", op.operatorName(),
return String.format(Locale.ROOT, "%s%s%s_%s%s", op.operatorName(),
(vspecies.elementType() == float.class ? "f" : "d"),
(isShapeAgnostic ? "x" : Integer.toString(vlen)),
precisionLevel(op),

53
test/jdk/jdk/incubator/vector/VectorMathLibraryLocaleTest.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2026, 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.
*/
/*
* @test
* @bug 8382267
* @summary VectorMathLibrary symbol names must not use locale-sensitive formatting
* @modules jdk.incubator.vector
* @run main/othervm -ea -Duser.language=ar -Duser.country=SA VectorMathLibraryLocaleTest
*/
import java.util.Locale;
import jdk.incubator.vector.FloatVector;
import jdk.incubator.vector.VectorOperators;
import jdk.incubator.vector.VectorSpecies;
public class VectorMathLibraryLocaleTest {
public static void main(String[] args) {
assert !String.format("%d", 16).equals("16") : "expected non-ASCII digits for locale " + Locale.getDefault();
VectorSpecies<Float> species = FloatVector.SPECIES_PREFERRED;
FloatVector v = FloatVector.broadcast(species, 1.0f);
// Without the fix, this throws InternalError due to locale-mangled symbol name.
// The assertion below is just a sanity check on the result.
FloatVector result = v.lanewise(VectorOperators.EXP);
float expected = (float) Math.E;
for (int i = 0; i < species.length(); i++) {
assert result.lane(i) == expected : "lane " + i + ": expected " + expected + ", got " + result.lane(i);
}
}
}