Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jdk17u
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
einsteinathome
openjdk
jdk17u
Commits
c436edbe
Commit
c436edbe
authored
9 months ago
by
Amit Kumar
Committed by
Paul Hohensee
9 months ago
Browse files
Options
Downloads
Patches
Plain Diff
8342962: [s390x] TestOSRLotsOfLocals.java crashes
Backport-of: 54327bc4e38773b7461977ce17f2185c068bce9b
parent
af17bf4c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+17
-3
17 additions, 3 deletions
src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
with
17 additions
and
3 deletions
src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+
17
−
3
View file @
c436edbe
...
...
@@ -133,9 +133,19 @@ void LIR_Assembler::osr_entry() {
// copied into place by code emitted in the IR.
Register
OSR_buf
=
osrBufferPointer
()
->
as_register
();
{
assert
(
frame
::
interpreter_frame_monitor_size
()
==
BasicObjectLock
::
size
(),
"adjust code below"
);
int
monitor_offset
=
BytesPerWord
*
method
()
->
max_locals
()
+
(
2
*
BytesPerWord
)
*
(
number_of_locks
-
1
);
{
assert
(
frame
::
interpreter_frame_monitor_size
()
==
BasicObjectLock
::
size
(),
"adjust code below"
);
const
int
locals_space
=
BytesPerWord
*
method
()
->
max_locals
();
int
monitor_offset
=
locals_space
+
(
2
*
BytesPerWord
)
*
(
number_of_locks
-
1
);
bool
large_offset
=
!
Immediate
::
is_simm20
(
monitor_offset
+
BytesPerWord
)
&&
number_of_locks
>
0
;
if
(
large_offset
)
{
// z_lg can only handle displacement upto 20bit signed binary integer
__
z_algfi
(
OSR_buf
,
locals_space
);
monitor_offset
-=
locals_space
;
}
// SharedRuntime::OSR_migration_begin() packs BasicObjectLocks in
// the OSR buffer using 2 word entries: first the lock and then
// the oop.
...
...
@@ -149,6 +159,10 @@ void LIR_Assembler::osr_entry() {
__
z_lg
(
Z_R1_scratch
,
slot_offset
+
1
*
BytesPerWord
,
OSR_buf
);
__
z_stg
(
Z_R1_scratch
,
frame_map
()
->
address_for_monitor_object
(
i
));
}
if
(
large_offset
)
{
__
z_slgfi
(
OSR_buf
,
locals_space
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment