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.

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

Add missing conversion for load generated by UnsafeFastPath #3218

Merged
merged 1 commit into from
Oct 11, 2018
Merged

Add missing conversion for load generated by UnsafeFastPath #3218

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
16 changes: 8 additions & 8 deletions runtime/compiler/optimizer/UnsafeFastPath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,12 +538,12 @@ int32_t TR_UnsafeFastPath::perform()
}
else
{
if (isByIndex && value->getDataType() != type)
if (value->getDataType() != type)
{
TR::ILOpCodes conversionOpCode = TR::ILOpCode::getProperConversion(value->getDataType(), type, true);

// Sanity check for future modifications
TR_ASSERT(conversionOpCode != TR::BadILOp, "Could not get proper conversion for a JITHelpers byIndex operation.\n");
TR_ASSERT(conversionOpCode != TR::BadILOp, "Could not get proper conversion on the value node %p n%dn for call %p n%dn.\n", value, value->getGlobalIndex(), node, node->getGlobalIndex());

value = TR::Node::create(conversionOpCode, 1, value);
}
Expand All @@ -560,12 +560,12 @@ int32_t TR_UnsafeFastPath::perform()
else
{
//This is a load
if (isByIndex && node->getDataType() != type)
if (node->getDataType() != type)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be an assert below guarding for future modifications. Are you certain we won't hit this assert? Note it's not a FATAL assert so it won't fire by default (outside of debug builds).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for Unsafe methods. Is there similar problem to JITHelpers methods like getByteFromArray? The method return byte but in trees we use icallx, so a conversion is needed on the load.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that you mention, I'll update the assertion message to not limit to JITHelpers.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fjeremic Have my comments answered your questions? Any more concerns?

{
TR::ILOpCodes conversionOpCode = TR::ILOpCode::getProperConversion(type, node->getDataType(), true);

// Sanity check for future modifications
TR_ASSERT(conversionOpCode != TR::BadILOp, "Could not get proper conversion for a JITHelpers byIndex operation.\n");
TR_ASSERT(conversionOpCode != TR::BadILOp, "Could not get proper conversion on the result of call %p n%dn.\n", node, node->getGlobalIndex());

TR::Node *load = TR::Node::createWithSymRef(node, comp()->il.opCodeForIndirectArrayLoad(type), 1, unsafeSymRef);

Expand Down Expand Up @@ -627,12 +627,12 @@ int32_t TR_UnsafeFastPath::perform()
node = TR::Node::recreateWithoutProperties(node, TR::wrtbari, 3, addrCalc, value, object, unsafeSymRef);
else
{
if (isByIndex && value->getDataType() != type)
if (value->getDataType() != type)
{
TR::ILOpCodes conversionOpCode = TR::ILOpCode::getProperConversion(value->getDataType(), type, true);

// Sanity check for future modifications
TR_ASSERT(conversionOpCode != TR::BadILOp, "Could not get proper conversion for a JITHelpers byIndex operation.\n");
TR_ASSERT(conversionOpCode != TR::BadILOp, "Could not get proper conversion on the value node %p n%dn for call %p n%dn.\n", value, value->getGlobalIndex(), node, node->getGlobalIndex());

value = TR::Node::create(conversionOpCode, 1, value);
}
Expand All @@ -653,12 +653,12 @@ int32_t TR_UnsafeFastPath::perform()
TR::ILOpCodes opCodeForIndirectLoad = isArrayOperation ? comp()->il.opCodeForIndirectArrayLoad(type) : comp()->il.opCodeForIndirectLoad(type);

// This is a load
if (isByIndex && node->getDataType() != type)
if (node->getDataType() != type)
{
TR::ILOpCodes conversionOpCode = TR::ILOpCode::getProperConversion(type, node->getDataType(), true);

// Sanity check for future modifications
TR_ASSERT(conversionOpCode != TR::BadILOp, "Could not get proper conversion for a JITHelpers byIndex operation.\n");
TR_ASSERT(conversionOpCode != TR::BadILOp, "Could not get proper conversion on the result of call %p n%dn.\n", node, node->getGlobalIndex());

TR::Node *load = TR::Node::createWithSymRef(node, opCodeForIndirectLoad, 1, unsafeSymRef);

Expand Down