Skip to content
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.

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

Ensure addClassFromCPRecord emits CP record #20680

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions runtime/compiler/runtime/SymbolValidationManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -838,16 +838,17 @@ TR::SymbolValidationManager::addClassFromCPRecord(TR_OpaqueClassBlock *clazz, J9
if (recordExists(&byName))
return true; // already have an equivalent ClassByName

bool added;
if (!isAlreadyValidated(clazz)) // save a ClassChainRecord
added = addClassRecordWithChain(new (_region) ClassByNameRecord(clazz, beholder));
else
added = addClassRecord(clazz, new (_region) ClassFromCPRecord(clazz, beholder, cpIndex));
{
if (!addClassRecordWithChain(new (_region) ClassByNameRecord(clazz, beholder)))
return false;
}

if (added)
_classesFromAnyCPIndex.insert(ClassFromAnyCPIndex(clazz, beholder));
if (!addClassRecord(clazz, new (_region) ClassFromCPRecord(clazz, beholder, cpIndex)))
return false;

return added;
_classesFromAnyCPIndex.insert(ClassFromAnyCPIndex(clazz, beholder));
return true;
}

bool
Expand Down