Navigation Menu

Skip to content

Commit

Permalink
8283422: Create a new test for JDK-8254790
Browse files Browse the repository at this point in the history
Reviewed-by: kvn, thartmann
  • Loading branch information
mrserb committed Mar 31, 2022
1 parent 6ebf845 commit ad83ec7
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 2 deletions.
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/TEST.groups
@@ -1,5 +1,5 @@
#
# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2013, 2022, 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
Expand Down Expand Up @@ -130,6 +130,7 @@ hotspot_slow_compiler = \
compiler/codegen/aes \
compiler/codecache/stress \
compiler/gcbarriers/PreserveFPRegistersTest.java \
resourcehogs/compiler \
:hotspot_compiler_arraycopy

tier1_compiler_1 = \
Expand Down
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
Expand Down Expand Up @@ -706,4 +706,18 @@ public static void test_asmStringEquals() {
}
}

static String longLatin1 = "0123456789A".repeat(100);
static String longUTF = "0123456789\ubeef".repeat(100);

@Test(role = Role.TEST_HELPER, compileAt = 4, warmup = 1, warmupArgs = { "0123456789", "1" })
public static boolean indexOf_use_result_immediately(String a, String b) {
char ch = b.charAt(0);
return ch == a.charAt(a.indexOf(ch));
}

@Test(role = Role.TEST_ENTRY)
public static void test_indexOf_use_result_immediately() {
assertTrue(indexOf_use_result_immediately(longLatin1, "A"));
assertTrue(indexOf_use_result_immediately(longUTF, "\ubeef"));
}
}
@@ -0,0 +1,61 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* Copyright Amazon.com Inc. 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 8254790
* @requires vm.bits == "64" & os.maxMemory > 8G
* @modules java.base/jdk.internal.misc
* @library /test/lib /test/hotspot/jtreg
*
* @build compiler.intrinsics.string.TestStringIntrinsics2
* @build sun.hotspot.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
*
* @run main/othervm
* -mx8G
* -Xbootclasspath/a:.
* -Xmixed
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions
* -XX:MaxInlineSize=70
* -XX:MinInlineFrequencyRatio=0
* resourcehogs.compiler.intrinsics.string.TestStringIntrinsics2LargeArray
*/

package resourcehogs.compiler.intrinsics.string;

import java.lang.ref.Reference;

import compiler.intrinsics.string.TestStringIntrinsics2;

public final class TestStringIntrinsics2LargeArray {
public static void main(String[] args) throws Exception {
int[] hugeArray = new int[Integer.MAX_VALUE / 2];
TestStringIntrinsics2.main(args);
Reference.reachabilityFence(hugeArray);
}
}

6 comments on commit ad83ec7

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@openjdk
Copy link

@openjdk openjdk bot commented on ad83ec7 Apr 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch mrserb-backport-ad83ec7e in my personal fork of openjdk/jdk18u. To create a pull request with this backport targeting openjdk/jdk18u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ad83ec7e from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 31 Mar 2022 and was reviewed by Vladimir Kozlov and Tobias Hartmann.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk18u:

$ git fetch https://github.com/openjdk-bots/jdk18u mrserb-backport-ad83ec7e:mrserb-backport-ad83ec7e
$ git checkout mrserb-backport-ad83ec7e
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk18u mrserb-backport-ad83ec7e

@mrserb
Copy link
Member Author

@mrserb mrserb commented on ad83ec7 Apr 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on ad83ec7 Apr 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch mrserb-backport-ad83ec7e in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ad83ec7e from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 31 Mar 2022 and was reviewed by Vladimir Kozlov and Tobias Hartmann.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev mrserb-backport-ad83ec7e:mrserb-backport-ad83ec7e
$ git checkout mrserb-backport-ad83ec7e
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev mrserb-backport-ad83ec7e

@mrserb
Copy link
Member Author

@mrserb mrserb commented on ad83ec7 Apr 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk15u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on ad83ec7 Apr 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb Could not automatically backport ad83ec7e to openjdk/jdk15u-dev due to conflicts in the following files:

  • test/hotspot/jtreg/TEST.groups
  • test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics2.java

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk15u-dev:

$ git checkout -b mrserb-backport-ad83ec7e
$ git fetch --no-tags https://git.openjdk.java.net/jdk ad83ec7e281cb3ab7c42e71fab47ea21b93079ea
$ git cherry-pick --no-commit ad83ec7e281cb3ab7c42e71fab47ea21b93079ea
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport ad83ec7e281cb3ab7c42e71fab47ea21b93079ea'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk15u-dev with the title Backport ad83ec7e281cb3ab7c42e71fab47ea21b93079ea.

Please sign in to comment.