Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
8288467: remove memory_operand assert for spilled instructions
Reviewed-by: thartmann, shade, jbhateja
  • Loading branch information
eme64 committed Jun 21, 2022
1 parent b9c3966 commit af05139
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/hotspot/share/opto/chaitin.cpp
Expand Up @@ -1732,8 +1732,13 @@ void PhaseChaitin::fixup_spills() {
// instructions which have "stackSlotX" parameter instead of "memory".
// For example, "MoveF2I_stack_reg". We always need a memory edge from
// src to cisc, else we might schedule cisc before src, loading from a
// spill location before storing the spill.
assert(cisc->memory_operand() == nullptr, "no memory operand, only stack");
// spill location before storing the spill. On some platforms, we land
// in this else case because mach->oper_input_base() > 1, i.e. we have
// multiple inputs. In some rare cases there are even multiple memory
// operands, before and after spilling.
// (e.g. spilling "addFPR24_reg_mem" to "addFPR24_mem_cisc")
// In either case, there is no space in the inputs for the memory edge
// so we add an additional precedence / memory edge.
cisc->add_prec(src);
}
block->map_node(cisc, j); // Insert into basic block
Expand Down

3 comments on commit af05139

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on af05139 Jun 27, 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 af05139 Jun 27, 2022

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch GoeLin-backport-af051391 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 af051391 from the openjdk/jdk19 repository.

The commit being backported was authored by Emanuel Peter on 21 Jun 2022 and was reviewed by Tobias Hartmann, Aleksey Shipilev and Jatin Bhateja.

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

Please sign in to comment.