Skip to content

8362564: hotspot/jtreg/compiler/c2/TestLWLockingCodeGen.java fails on static JDK on x86_64 with AVX instruction extensions #26395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

8362564: hotspot/jtreg/compiler/c2/TestLWLockingCodeGen.java fails on static JDK on x86_64 with AVX instruction extensions #26395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/hotspot/cpu/x86/stubDeclarations_x86.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
do_arch_blob, \
do_arch_entry, \
do_arch_entry_init) \
do_arch_blob(initial, 20000 WINDOWS_ONLY(+1000)) \
do_arch_blob(initial, PRODUCT_ONLY(20000) NOT_PRODUCT(21000) WINDOWS_ONLY(+1000)) \
do_stub(initial, verify_mxcsr) \
do_arch_entry(x86, initial, verify_mxcsr, verify_mxcsr_entry, \
verify_mxcsr_entry) \
Expand Down
8 changes: 5 additions & 3 deletions src/hotspot/share/runtime/stubRoutines.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ static BufferBlob* initialize_stubs(BlobId blob_id,
}
CodeBuffer buffer(stubs_code);
StubGenerator_generate(&buffer, blob_id);
// When new stubs added we need to make sure there is some space left
// to catch situation when we should increase size again.
assert(code_size == 0 || buffer.insts_remaining() > 200, "increase %s", assert_msg);

LogTarget(Info, stubs) lt;
if (lt.is_enabled()) {
Expand All @@ -167,6 +164,11 @@ static BufferBlob* initialize_stubs(BlobId blob_id,
buffer_name, p2i(stubs_code->content_begin()), p2i(stubs_code->content_end()),
buffer.total_content_size(), buffer.insts_remaining());
}

// When new stubs added we need to make sure there is some space left
// to catch situation when we should increase size again.
assert(code_size == 0 || buffer.insts_remaining() > 200, "increase %s", assert_msg);
Copy link
Member

Choose a reason for hiding this comment

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

What is the reason to move the assert?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@eastig Thanks for taking a look!

The log Info, stubs output provides useful details. With the assertion failure, it wouldn't show. That's why moving the assert to after the log output.


return stubs_code;
}

Expand Down