archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8152636: TestHasNegatives.java fails after Jigsaw changes were integrated

Browse source 
Reviewed-by: kvn
This commit is contained in:
Igor Ignatyev 2016-03-30 00:25:39 +03:00
parent d39c84770b
commit 9723b912e9
2 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hotspot/test/compiler/intrinsics/string/TestHasNegatives.java
View file

@ -26,18 +26,19 @@
/* /*
* @test * @test
* @bug 8054307 * @bug 8054307
* @ignore 8152636
* @summary Validates StringCoding.hasNegatives intrinsic with a small range of tests. * @summary Validates StringCoding.hasNegatives intrinsic with a small range of tests.
* @run main/bootclasspath java.lang.TestHasNegatives * @library /compiler/patches
* @build java.base/java.lang.Helper
* @build compiler.intrinsics.string.TestHasNegatives
* @run main compiler.intrinsics.string.TestHasNegatives
*/ */
package java.lang; package compiler.intrinsics.string;
import java.lang.StringCoding; import java.lang.Helper;
/* /*
* @summary Validates StringCoding.hasNegatives intrinsic with a small * @summary Validates StringCoding.hasNegatives intrinsic with a small
* range of tests. Must be run with modified bootclasspath * range of tests.
* to allow existence in java.lang package.
*/ */
public class TestHasNegatives { public class TestHasNegatives {
@ -95,7 +96,7 @@ public class TestHasNegatives {
if (len + off > tBa.length) if (len + off > tBa.length)
continue; continue;
initialize(off, len, ng); initialize(off, len, ng);
r = StringCoding.hasNegatives(tBa, off, len); r = Helper.StringCodingHasNegatives(tBa, off, len);
if (r ^ ((ng == 0) ? false : true)) { if (r ^ ((ng == 0) ? false : true)) {
throw new Exception("Failed test hasNegatives " + "offset: " + off + " " throw new Exception("Failed test hasNegatives " + "offset: " + off + " "
+ "length: " + len + " " + "return: " + r + " " + "negatives: " + "length: " + len + " " + "return: " + r + " " + "negatives: "

36
hotspot/test/compiler/patches/java.base/java/lang/Helper.java Normal file
View file

@ -0,0 +1,36 @@
/*
* Copyright (c) 2016, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package java.lang;
/**
* A helper class to get access to package-private members
*/
public class Helper {
@jdk.internal.vm.annotation.ForceInline
public static boolean StringCodingHasNegatives(byte[] ba, int off, int len) {
return StringCoding.hasNegatives(ba, off, len);
}
}