Skip to content

Commit

Permalink
8332699: ubsan: jfrEventSetting.inline.hpp:31:43: runtime error: inde…
Browse files Browse the repository at this point in the history 
…x 163 out of bounds for type 'jfrNativeEventSetting [162]'

Reviewed-by: jbechberger, stuefe
  • Loading branch information
@MBaesken
MBaesken committed Jun 12, 2024
1 parent bd046d9 commit abbf45b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions make/src/classes/build/tools/jfr/GenerateJfrFiles.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2024, 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 @@ -663,7 +663,7 @@ private static void printJfrEventControlHpp(Metadata metadata, File outputFile)
out.write("");
out.write("union JfrNativeSettings {");
out.write(" // Array version.");
out.write(" jfrNativeEventSetting bits[NUMBER_OF_EVENTS];");
out.write(" jfrNativeEventSetting bits[NUMBER_OF_EVENTS + NUMBER_OF_RESERVED_EVENTS];");
out.write(" // Then, to make it easy to debug,");
out.write(" // add named struct members also.");
out.write(" struct {");
Expand Down

5 comments on commit abbf45b

@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

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk23u

@openjdk
Copy link

@openjdk openjdk bot commented on abbf45b Jul 26, 2024

Choose a reason for hiding this comment

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

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

The commit being backported was authored by Matthias Baesken on 12 Jun 2024 and was reviewed by Johannes Bechberger and Thomas Stuefe.

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

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

@MBaesken
Copy link
Member Author

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 abbf45b Jul 29, 2024

Choose a reason for hiding this comment

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

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

  • make/src/classes/build/tools/jfr/GenerateJfrFiles.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-MBaesken-abbf45b5-master

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

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

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

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

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

Hi all,

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

The commit being backported was authored by Matthias Baesken on 12 Jun 2024 and was reviewed by Johannes Bechberger and Thomas Stuefe.

Thanks!

Please sign in to comment.