Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
Reviewed-by: thartmann, lucy
  • Loading branch information
TheRealMDoerr committed Aug 28, 2023
1 parent 1664e79 commit cf2d33c
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/hotspot/share/c1/c1_LinearScan.cpp
Expand Up @@ -1949,6 +1949,14 @@ void LinearScan::resolve_exception_edge(XHandler* handler, int throwing_op_id, i
// interval at the throwing instruction must be searched using the operands
// of the phi function
Value from_value = phi->operand_at(handler->phi_operand());
if (from_value == nullptr) {
// We have reached here in a kotlin application running with JVMTI
// capability "can_access_local_variables".
// The illegal state is not yet propagated to this phi. Do it here.
phi->make_illegal();
// We can skip the illegal phi edge.
return;
}

// with phi functions it can happen that the same from_value is used in
// multiple mappings, so notify move-resolver that this is allowed
Expand Down

7 comments on commit cf2d33c

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@TheRealMDoerr
Copy link
Contributor Author

Choose a reason for hiding this comment

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

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on cf2d33c Aug 31, 2023

Choose a reason for hiding this comment

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

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

The commit being backported was authored by Martin Doerr on 28 Aug 2023 and was reviewed by Tobias Hartmann and Lutz Schmidt.

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

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

@TheRealMDoerr
Copy link
Contributor Author

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 cf2d33c Aug 31, 2023

Choose a reason for hiding this comment

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

@TheRealMDoerr the backport was successfully created on the branch TheRealMDoerr-backport-cf2d33ca 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 cf2d33ca from the openjdk/jdk repository.

The commit being backported was authored by Martin Doerr on 28 Aug 2023 and was reviewed by Tobias Hartmann and Lutz Schmidt.

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.git TheRealMDoerr-backport-cf2d33ca:TheRealMDoerr-backport-cf2d33ca
$ git checkout TheRealMDoerr-backport-cf2d33ca
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git TheRealMDoerr-backport-cf2d33ca

@TheRealMDoerr
Copy link
Contributor Author

Choose a reason for hiding this comment

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

/backport jdk17u

@openjdk
Copy link

@openjdk openjdk bot commented on cf2d33c Sep 1, 2023

Choose a reason for hiding this comment

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

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

The commit being backported was authored by Martin Doerr on 28 Aug 2023 and was reviewed by Tobias Hartmann and Lutz Schmidt.

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:

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

Please sign in to comment.