Skip to content

8359344: C2: Malformed control flow after intrinsic bailout #25936

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

Closed
wants to merge 14 commits into from
Closed

8359344: C2: Malformed control flow after intrinsic bailout #25936

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b1a06fc
Trying something
marc-chevalier Jun 18, 2025
867df72
Fix test
marc-chevalier Jun 18, 2025
0796e25
Re-try
marc-chevalier Jun 19, 2025
e51716d
Adapt test
marc-chevalier Jun 19, 2025
4e8ce18
Urgh
marc-chevalier Jun 20, 2025
54b07e9
whoops Forgot to remove a bit, and restore sp
marc-chevalier Jun 20, 2025
d51853c
Remove useless loop
marc-chevalier Jul 1, 2025
f0574bf
Address comments
marc-chevalier Jul 8, 2025
e57cf47
Merge remote-tracking branch 'origin/master' into fix/too-many-ctrl-s…
marc-chevalier Jul 8, 2025
09b24ec
Somehow intellij doesn't remove empty indented line
marc-chevalier Jul 8, 2025
e098535
Re-insert
marc-chevalier Jul 8, 2025
5913377
Tentative addressing Vladimir's comments
marc-chevalier Jul 9, 2025
31ba6a3
+'_' and ctor init
marc-chevalier Jul 9, 2025
be5c024
Forgot to destruct_map_clone
marc-chevalier Jul 9, 2025
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
8 changes: 5 additions & 3 deletions src/hotspot/share/opto/library_call.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,7 +2375,8 @@ LibraryCallKit::SavedState::SavedState(LibraryCallKit* kit) :
_kit(kit),
_sp(kit->sp()),
_jvms(kit->jvms()),
_map(kit->clone_map())
_map(kit->clone_map()),
_discarded(false)
{
for (DUIterator_Fast imax, i = kit->control()->fast_outs(imax); i < imax; i++) {
Node* out = kit->control()->fast_out(i);
Expand All @@ -2386,7 +2387,8 @@ LibraryCallKit::SavedState::SavedState(LibraryCallKit* kit) :
}

LibraryCallKit::SavedState::~SavedState() {
if (discarded) {
if (_discarded) {
_kit->destruct_map_clone(_map);
return;
}
_kit->jvms()->set_map(_map);
Expand All @@ -2407,7 +2409,7 @@ LibraryCallKit::SavedState::~SavedState() {
}

void LibraryCallKit::SavedState::discard() {
discarded = true;
_discarded = true;
}

bool LibraryCallKit::inline_unsafe_access(bool is_store, const BasicType type, const AccessKind kind, const bool unaligned) {
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/opto/library_call.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class LibraryCallKit : public GraphKit {
JVMState* _jvms;
SafePointNode* _map;
Unique_Node_List _ctrl_succ;
bool discarded = false;
bool _discarded;

public:
SavedState(LibraryCallKit*);
Expand Down