Skip to content

Commit

Permalink
8346965: Multiple compiler/ciReplay test fails with -XX:+SegmentedCod…
Browse files Browse the repository at this point in the history 
…eCache

Reviewed-by: kvn
  • Loading branch information
SendaoYan committed Jan 7, 2025
1 parent e5f0c19 commit cf3e48e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, 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 @@ -71,6 +71,7 @@ public abstract class CiReplayBase {
"-XX:-BackgroundCompilation", "-XX:CompileCommand=inline,java.io.PrintStream::*",
"-XX:+IgnoreUnrecognizedVMOptions", "-XX:TypeProfileLevel=222", // extra profile data as a stress test
"-XX:+CICountNative", "-XX:CICrashAt=1", "-XX:+DumpReplayDataOnError",
"-XX:-SegmentedCodeCache",
REPLAY_FILE_OPTION};
private static final String[] REPLAY_OPTIONS = new String[]{DISABLE_COREDUMP_ON_CRASH,
"-XX:+IgnoreUnrecognizedVMOptions", "-XX:TypeProfileLevel=222",
Expand Down

5 comments on commit cf3e48e

@sendaoYan
Copy link
Member

Choose a reason for hiding this comment

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

/backport :jdk24

@sendaoYan
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on cf3e48e Jan 7, 2025

Choose a reason for hiding this comment

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

@sendaoYan the backport was successfully created on the branch backport-sendaoYan-cf3e48e7-jdk24 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk24, 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 cf3e48e7 from the openjdk/jdk repository.

The commit being backported was authored by SendaoYan on 7 Jan 2025 and was reviewed by Vladimir Kozlov.

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/jdk:

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

@openjdk
Copy link

@openjdk openjdk bot commented on cf3e48e Jan 7, 2025

Choose a reason for hiding this comment

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

@sendaoYan Could not automatically backport cf3e48e7 to openjdk/jdk21u-dev due to conflicts in the following files:

  • test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-sendaoYan-cf3e48e7-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git cf3e48e77172db7e27530af9754e1ead8d493f52

# Backport the commit
$ git cherry-pick --no-commit cf3e48e77172db7e27530af9754e1ead8d493f52
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport cf3e48e77172db7e27530af9754e1ead8d493f52'

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

Below you can find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by SendaoYan on 7 Jan 2025 and was reviewed by Vladimir Kozlov.

Thanks!

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

Please sign in to comment.