infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-28 16:50:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for nullptr padding

Browse Source
This commit is contained in:
Casper Norrbin 2026-03-09 13:06:39 +01:00
parent 3cb20bb1cf
commit 64fc7e8d7f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hotspot/share/classfile/fieldLayoutBuilder.cpp
View File

@ -644,10 +644,16 @@ void FieldLayoutBuilder::compute_regular_layout() {
if (!_contended_groups.is_empty()) {
for (int i = 0; i < _contended_groups.length(); i++) {
FieldGroup* cg = _contended_groups.at(i);
LayoutRawBlock* padding = insert_contended_padding(_layout->last_block());
LayoutRawBlock* start = _layout->last_block();
LayoutRawBlock* padding = insert_contended_padding(start);
// Do not insert fields past the padding block.
_layout->add(cg->primitive_fields(), padding);
_layout->add(cg->oop_fields(), padding);
if (padding != nullptr) {
start = padding;
}
_layout->add(cg->primitive_fields(), start);
_layout->add(cg->oop_fields(), start);
need_tail_padding = true;
}
}