Skip to content

Commit

Permalink
Change default implementation of makeParameterList
Browse files Browse the repository at this point in the history 
The two implementations of `ResolvedMethod::makeParameterList` in
JitBuilder and CompilerTest are identical, and they are a more appropriate
default implementation in OMR than the existing `makeParameterList` which
is tailored to OpenJ9.  Consolidate their implementations in the OMR
`TR_ResolvedMethod` class and remove their implementations from JitBuilder
and CompilerTest.

Signed-off-by: Daryl Maier <maier@ca.ibm.com>
  • Loading branch information
@0xdaryl
0xdaryl committed Oct 16, 2019
1 parent 1bc0b85 commit a28b6e1
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 146 deletions.
91 changes: 10 additions & 81 deletions compiler/compile/Method.cpp
View file
Expand Up @@ -351,10 +351,11 @@ OMR::Method::isBigDecimalConvertersMethod(TR::Compilation * comp)
return false;
}

TR::Method *TR_ResolvedMethod::convertToMethod() { TR_UNIMPLEMENTED(); return 0; }
TR::Method * TR_ResolvedMethod::convertToMethod() { TR_UNIMPLEMENTED(); return 0; }
uint32_t TR_ResolvedMethod::numberOfParameters() { TR_UNIMPLEMENTED(); return 0; }
uint32_t TR_ResolvedMethod::numberOfExplicitParameters() { TR_UNIMPLEMENTED(); return 0; }
TR::DataType TR_ResolvedMethod::parmType(uint32_t) { TR_UNIMPLEMENTED(); return TR::NoType; }
char * TR_ResolvedMethod::getParameterTypeSignature(int32_t parmIndex) { TR_UNIMPLEMENTED(); return 0; }
TR::ILOpCodes TR_ResolvedMethod::directCallOpCode() { TR_UNIMPLEMENTED(); return TR::BadILOp; }
TR::ILOpCodes TR_ResolvedMethod::indirectCallOpCode() { TR_UNIMPLEMENTED(); return TR::BadILOp; }
TR::DataType TR_ResolvedMethod::returnType() { TR_UNIMPLEMENTED(); return TR::NoType; }
Expand Down Expand Up @@ -569,107 +570,35 @@ TR_ResolvedMethod::_genMethodILForPeeking(TR::ResolvedMethodSymbol *, TR::Compil
return 0;
}


TR::ResolvedMethodSymbol* TR_ResolvedMethod::findOrCreateJittedMethodSymbol(TR::Compilation *comp)
{
return comp->createJittedMethodSymbol(this);
}

// This version is suitable for Java
void TR_ResolvedMethod::makeParameterList(TR::ResolvedMethodSymbol *methodSym)
{
if (methodSym->getTempIndex() != -1)
return;

const char *className = classNameChars();
const int classNameLen = classNameLength();
const char *sig = signatureChars();
const int sigLen = signatureLength();
const char *sigEnd = sig + sigLen;

ListAppender<TR::ParameterSymbol> la(&methodSym->getParameterList());
TR::ParameterSymbol *parmSymbol;
int32_t slot;
int32_t slot = 0;
int32_t ordinal = 0;
if (methodSym->isStatic())
{
slot = 0;
}
else
{
TR::KnownObjectTable::Index knownObjectIndex = methodSym->getKnownObjectIndexForParm(0);
parmSymbol = methodSym->comp()->getSymRefTab()->createParameterSymbol(methodSym, 0, TR::Address, knownObjectIndex);
parmSymbol->setOrdinal(ordinal++);

int32_t len = classNameLen; // len is passed by reference and changes during the call
char * s = classNameToSignature(className, len, methodSym->comp(), heapAlloc);

la.add(parmSymbol);
parmSymbol->setTypeSignature(s, len);

slot = 1;
}

const char *s = sig;
TR_ASSERT(*s == '(', "Bad signature for method: <%s>", s);
++s;

uint32_t parmSlots = numberOfParameterSlots();
for (int32_t parmIndex = 0; slot < parmSlots; ++parmIndex)
for (int32_t parmIndex = 0; parmIndex < parmSlots; ++parmIndex)
{
TR::DataType type = parmType(parmIndex);
int32_t size = methodSym->convertTypeToSize(type);
if (size < 4) type = TR::Int32;

const char *end = s;

// Walk past array dims, if any
while (*end == '[')
{
++end;
}

// Walk to the end of the class name, if this is a class name
if (*end == 'L')
{
// Assume the form is L<classname>; where <classname> is
// at least 1 char and therefore skip the first 2 chars
end += 2;
end = (char *)memchr(end, ';', sigEnd - end);
TR_ASSERT(end != NULL, "Unexpected NULL, expecting to find a parm of the form L<classname>;");
}

// The static_cast<int>(...) is added as a work around for an XLC bug that results in the
// pointer subtraction below getting converted into a 32-bit signed integer subtraction
int len = static_cast<int>(end - s) + 1;

parmSymbol = methodSym->comp()->getSymRefTab()->createParameterSymbol(methodSym, slot, type);
parmSymbol = methodSym->comp()->getSymRefTab()->createParameterSymbol(methodSym, slot, parmType(parmIndex));
parmSymbol->setOrdinal(ordinal++);
parmSymbol->setTypeSignature(s, len);

s += len;
char *s = getParameterTypeSignature(parmIndex);
uint32_t len = strlen(s);
parmSymbol->setTypeSignature(s, len);

la.add(parmSymbol);
if (type == TR::Int64 || type == TR::Double)
{
slot += 2;
}
else
{
++slot;
}
}

int32_t lastInterpreterSlot = parmSlots + numberOfTemps();

if ((methodSym->isSynchronised() || methodSym->getResolvedMethod()->isNonEmptyObjectConstructor()) &&
methodSym->comp()->getOption(TR_MimicInterpreterFrameShape))
{
++lastInterpreterSlot;
++slot;
}

int32_t lastInterpreterSlot = slot + numberOfTemps();
methodSym->setTempIndex(lastInterpreterSlot, methodSym->comp()->fe());

methodSym->setFirstJitTempIndex(methodSym->getTempIndex());
}

Expand Down
16 changes: 15 additions & 1 deletion compiler/compile/ResolvedMethod.hpp
View file
Expand Up @@ -281,7 +281,21 @@ class TR_ResolvedMethod
bool resetVisitCount,
TR_PrexArgInfo *argInfo);

// Make up a parameter list for the corresponding TR::ResolvedMethodSymbol
/**
* @brief Retrieve the type signature name for the given parameter index.
*
* @param[in] parmIndex : The parameter index
*
* @return The char * type signature name.
*/
virtual char *getParameterTypeSignature(int32_t parmIndex);

/**
* @brief Create TR::ParameterSymbols from the signature of a method, and add them
* to the ParameterList on the ResolvedMethodSymbol.
*
* @param[in] methodSym : the ResolvedMethodSymbol to create the parameter list for
*/
virtual void makeParameterList(TR::ResolvedMethodSymbol *);

virtual TR::ResolvedMethodSymbol *findOrCreateJittedMethodSymbol(TR::Compilation *comp);
Expand Down
38 changes: 7 additions & 31 deletions fvtest/compilertest/compile/Method.cpp
View file
Expand Up @@ -119,37 +119,6 @@ ResolvedMethod::computeSignatureChars()
_signatureChars[s++] = 0;
}

void
ResolvedMethod::makeParameterList(TR::ResolvedMethodSymbol *methodSym)
{
ListAppender<TR::ParameterSymbol> la(&methodSym->getParameterList());
TR::ParameterSymbol *parmSymbol;
int32_t slot = 0;
int32_t ordinal = 0;

uint32_t parmSlots = numberOfParameterSlots();
for (int32_t parmIndex = 0; parmIndex < parmSlots; ++parmIndex)
{
TR::IlType *type = _parmTypes[parmIndex];
TR::DataType dt = type->getPrimitiveType();
int32_t size = methodSym->convertTypeToSize(dt);

parmSymbol = methodSym->comp()->getSymRefTab()->createParameterSymbol(methodSym, slot, type->getPrimitiveType());
parmSymbol->setOrdinal(ordinal++);

char *s = type->getSignatureName();
uint32_t len = strlen(s);
parmSymbol->setTypeSignature(s, len);

la.add(parmSymbol);

++slot;
}

int32_t lastInterpreterSlot = slot + numberOfTemps();
methodSym->setTempIndex(lastInterpreterSlot, methodSym->comp()->fe());
methodSym->setFirstJitTempIndex(methodSym->getTempIndex());
}

char *
ResolvedMethod::localName(uint32_t slot,
Expand Down Expand Up @@ -192,4 +161,11 @@ ResolvedMethod::returnType()
{
return _returnType->getPrimitiveType();
}

char *
ResolvedMethod::getParameterTypeSignature(int32_t parmIndex)
{
return _parmTypes[parmIndex]->getSignatureName();
}

} // namespace TestCompiler
3 changes: 2 additions & 1 deletion fvtest/compilertest/compile/Method.hpp
View file
Expand Up @@ -146,6 +146,8 @@ class ResolvedMethod : public ResolvedMethodBase, public Method
virtual TR::DataType parmType(uint32_t slot);
virtual uint16_t numberOfTemps() { return 0; }

virtual char * getParameterTypeSignature(int32_t parmIndex);

virtual void * startAddressForJittedMethod() { return (getEntryPoint()); }
virtual void * startAddressForInterpreterOfJittedMethod() { return 0; }

Expand All @@ -164,7 +166,6 @@ class ResolvedMethod : public ResolvedMethodBase, public Method

void computeSignatureCharsPrimitive();
void computeSignatureChars();
virtual void makeParameterList(TR::ResolvedMethodSymbol *);

TR::IlInjector *getInjector(TR::IlGeneratorMethodDetails * details,
TR::ResolvedMethodSymbol *methodSymbol,
Expand Down
38 changes: 7 additions & 31 deletions jitbuilder/compile/Method.cpp
View file
Expand Up @@ -138,37 +138,6 @@ JitBuilder::ResolvedMethod::computeSignatureChars()
_signatureChars[s++] = 0;
}

void
JitBuilder::ResolvedMethod::makeParameterList(TR::ResolvedMethodSymbol *methodSym)
{
ListAppender<TR::ParameterSymbol> la(&methodSym->getParameterList());
TR::ParameterSymbol *parmSymbol;
int32_t slot = 0;
int32_t ordinal = 0;

uint32_t parmSlots = numberOfParameterSlots();
for (int32_t parmIndex = 0; parmIndex < parmSlots; ++parmIndex)
{
TR::IlType *type = _parmTypes[parmIndex];
TR::DataType dt = type->getPrimitiveType();
int32_t size = methodSym->convertTypeToSize(dt);

parmSymbol = methodSym->comp()->getSymRefTab()->createParameterSymbol(methodSym, slot, type->getPrimitiveType());
parmSymbol->setOrdinal(ordinal++);

char *s = type->getSignatureName();
uint32_t len = strlen(s);
parmSymbol->setTypeSignature(s, len);

la.add(parmSymbol);

++slot;
}

int32_t lastInterpreterSlot = slot + numberOfTemps();
methodSym->setTempIndex(lastInterpreterSlot, methodSym->comp()->fe());
methodSym->setFirstJitTempIndex(methodSym->getTempIndex());
}

char *
JitBuilder::ResolvedMethod::localName(uint32_t slot,
Expand Down Expand Up @@ -211,3 +180,10 @@ JitBuilder::ResolvedMethod::returnType()
{
return _returnType->getPrimitiveType();
}

char *
JitBuilder::ResolvedMethod::getParameterTypeSignature(int32_t parmIndex)
{
return _parmTypes[parmIndex]->getSignatureName();
}

3 changes: 2 additions & 1 deletion jitbuilder/compile/Method.hpp
View file
Expand Up @@ -149,6 +149,8 @@ class ResolvedMethod : public ResolvedMethodBase, public Method
virtual TR::DataType parmType(uint32_t slot);
virtual uint16_t numberOfTemps() { return 0; }

virtual char * getParameterTypeSignature(int32_t parmIndex);

virtual void * startAddressForJittedMethod() { return (getEntryPoint()); }
virtual void * startAddressForInterpreterOfJittedMethod() { return 0; }

Expand All @@ -167,7 +169,6 @@ class ResolvedMethod : public ResolvedMethodBase, public Method

void computeSignatureCharsPrimitive();
void computeSignatureChars();
virtual void makeParameterList(TR::ResolvedMethodSymbol *);

TR::IlInjector *getInjector(TR::IlGeneratorMethodDetails * details,
TR::ResolvedMethodSymbol *methodSymbol,
Expand Down

0 comments on commit a28b6e1

Please sign in to comment.