Skip to content

Commit 176c759

Browse files
committed
Code refactoring
1 parent d369958 commit 176c759

File tree

3 files changed

+286
-280
lines changed

3 files changed

+286
-280
lines changed

runtime/compiler/control/JITClientCompilationThread.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,9 +2960,10 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
29602960
break;
29612961
case MessageType::KnownObjectTable_addFieldAddressFromBaseIndex:
29622962
{
2963-
auto recv = client->getRecvData<TR::KnownObjectTable::Index, intptr_t>();
2963+
auto recv = client->getRecvData<TR::KnownObjectTable::Index, intptr_t, bool>();
29642964
TR::KnownObjectTable::Index baseObjectIndex = std::get<0>(recv);
29652965
intptr_t fieldOffset = std::get<1>(recv);
2966+
bool isArrayWithConstantElements = std::get<2>(recv);
29662967

29672968
TR::KnownObjectTable::Index resultIndex = TR::KnownObjectTable::UNKNOWN;
29682969

@@ -2974,11 +2975,11 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
29742975
uintptr_t objectPointer = fe->getReferenceFieldAtAddress(fieldAddress);
29752976

29762977
if (objectPointer)
2977-
resultIndex = knot->getOrCreateIndex(objectPointer);
2978+
resultIndex = knot->getOrCreateIndexAt(&objectPointer, isArrayWithConstantElements);
29782979
}
29792980

2980-
uintptr_t *resultPointer =
2981-
(resultIndex == -1) ? NULL : knot->getPointerLocation(resultIndex);
2981+
uintptr_t *resultPointer = (resultIndex == TR::KnownObjectTable::UNKNOWN) ?
2982+
NULL : knot->getPointerLocation(resultIndex);
29822983

29832984
client->write(response, resultIndex, resultPointer);
29842985
}
@@ -2989,15 +2990,15 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
29892990
TR::KnownObjectTable::Index baseObjectIndex = std::get<0>(recv);
29902991
intptr_t fieldOffset = std::get<1>(recv);
29912992

2992-
UDATA data = 0;
2993+
J9::TransformUtil::value data;
29932994

29942995
{
29952996
TR::VMAccessCriticalSection addFieldAddressFromBaseIndex(fe);
29962997
uintptr_t baseObjectAddress = knot->getPointer(baseObjectIndex);
29972998

29982999
uintptr_t fieldAddress = baseObjectAddress + fieldOffset;
29993000

3000-
data = *(UDATA *) fieldAddress;
3001+
data = *(J9::TransformUtil::value *) fieldAddress;
30013002
}
30023003

30033004
client->write(response, data);

0 commit comments

Comments
 (0)