Skip to content

Add a new symbol flag to mark addresses within method bounds #6230

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

Merged
0xdaryl merged 1 commit into from
Nov 9, 2021
Merged

Add a new symbol flag to mark addresses within method bounds #6230

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: 2 additions & 0 deletions compiler/compile/OMRSymbolReferenceTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,7 @@ OMR::SymbolReferenceTable::findOrCreateGCRPatchPointSymbolRef()
sym->setStaticAddress(0);
sym->setGCRPatchPoint(); // set the flag
sym->setNotDataAddress();
sym->setStaticAddressWithinMethodBounds();
element(gcrPatchPointSymbol) = new (trHeapMemory()) TR::SymbolReference(self(), gcrPatchPointSymbol, sym);
}
return element(gcrPatchPointSymbol);
Expand All @@ -1241,6 +1242,7 @@ OMR::SymbolReferenceTable::findOrCreateStartPCSymbolRef()
sym->setStaticAddress(0);
sym->setStartPC();
sym->setNotDataAddress();
sym->setStaticAddressWithinMethodBounds();
element(startPCSymbol) = new (trHeapMemory()) TR::SymbolReference(self(), startPCSymbol, sym);
}
return element(startPCSymbol);
Expand Down
4 changes: 4 additions & 0 deletions compiler/il/OMRSymbol.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,9 @@ class OMR_EXTENSIBLE Symbol
inline void setConstantPoolAddress();
inline bool isConstantPoolAddress();

inline void setStaticAddressWithinMethodBounds();
inline bool isStaticAddressWithinMethodBounds();

// flag methods specific to resolved
//
inline bool isJittedMethod();
Expand Down Expand Up @@ -516,6 +519,7 @@ class OMR_EXTENSIBLE Symbol
CountForRecompile = 0x02000000,
RecompilationCounter = 0x01000000,
GCRPatchPoint = 0x00400000,
StaticAddressWithinMethodBounds = 0x00800000, // Address is inside a method body and can be accessed with RIP addressing without relocations

//Only Used by Symbols for which isResolvedMethod is true;
IsJittedMethod = 0x80000000,
Expand Down
13 changes: 13 additions & 0 deletions compiler/il/OMRSymbol_inlines.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,19 @@ OMR::Symbol::setConstantPoolAddress()
_flags.set(ConstantPoolAddress);
}

bool
OMR::Symbol::isStaticAddressWithinMethodBounds()
{
return self()->isStatic() && _flags.testAny(StaticAddressWithinMethodBounds);
}

void
OMR::Symbol::setStaticAddressWithinMethodBounds()
{
TR_ASSERT(self()->isStatic(), "Symbol must be static");
_flags.set(StaticAddressWithinMethodBounds);
}

bool
OMR::Symbol::isConstMethodHandle()
{
Expand Down
2 changes: 1 addition & 1 deletion compiler/x/amd64/codegen/OMRMemoryReference.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ bool OMR::X86::AMD64::MemoryReference::needsAddressLoadInstruction(intptr_t next
return true; // If a class gets replaced, it may no longer fit in an immediate
else if (IS_32BIT_SIGNED(displacement))
return false;
else if (cg->comp()->isOutOfProcessCompilation() && sr.getSymbol() && sr.getSymbol()->isStatic() && !sr.getSymbol()->isNotDataAddress())
else if (cg->comp()->isOutOfProcessCompilation() && sr.getSymbol() && sr.getSymbol()->isStatic() && !sr.getSymbol()->isStaticAddressWithinMethodBounds())
return true;
else if (IS_32BIT_RIP(displacement, nextInstructionAddress))
return false;
Expand Down