Skip to content

Commit

Permalink
Fix -Wlogical-op-parentheses
Browse files Browse the repository at this point in the history
```
warning: '&&' within '||' [-Wlogical-op-parentheses]
```
  • Loading branch information
fjeremic committed May 8, 2021
1 parent 140c336 commit ba13223
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions compiler/control/OMROptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2073,8 +2073,8 @@ OMR::Options::jitLatePostProcess(TR::OptionSet *optionSet, void * jitConfig)
_queueWeightThresholdForStarvation = TR::Compiler->target.numberOfProcessors() <= 2 ? 1600 : 3200;

// enable by default rampup improvements
if (! (TR::Options::getCmdLineOptions() && TR::Options::getCmdLineOptions()->getOption(TR_DisableRampupImprovements) ||
TR::Options::getAOTCmdLineOptions() && TR::Options::getAOTCmdLineOptions()->getOption(TR_DisableRampupImprovements)))
if (! ((TR::Options::getCmdLineOptions() && TR::Options::getCmdLineOptions()->getOption(TR_DisableRampupImprovements)) ||
(TR::Options::getAOTCmdLineOptions() && TR::Options::getAOTCmdLineOptions()->getOption(TR_DisableRampupImprovements))))
{
self()->setOption(TR_EnableDowngradeOnHugeQSZ);
self()->setOption(TR_EnableMultipleGCRPeriods);
Expand Down
4 changes: 2 additions & 2 deletions compiler/il/OMRBlock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1176,8 +1176,8 @@ static TR::SymbolReference * createSymRefForNode(TR::Compilation *comp, TR::Reso
// 2. Itself is a pointer to array object.
TR::SymbolReference *valueChildSymRef = valueChild->getSymbolReference();
if (valueChildSymRef != NULL &&
(valueChild->getOpCode().isLoadVarDirect() && valueChildSymRef->getSymbol()->isAuto()) ||
(valueChild->getOpCode().isLoadReg() && valueChildSymRef->getSymbol()->castToAutoSymbol()->isInternalPointer()))
((valueChild->getOpCode().isLoadVarDirect() && valueChildSymRef->getSymbol()->isAuto()) ||
(valueChild->getOpCode().isLoadReg() && valueChildSymRef->getSymbol()->castToAutoSymbol()->isInternalPointer())))
{
if (valueChildSymRef->getSymbol()->castToAutoSymbol()->isInternalPointer())
{
Expand Down
4 changes: 2 additions & 2 deletions compiler/optimizer/LoopVersioner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8095,8 +8095,8 @@ bool TR_LoopVersioner::depsForLoopEntryPrep(
//
TR::Node *divisor = node->getSecondChild();
bool divisorIsNonzeroConstant =
divisor->getOpCodeValue() == TR::lconst && divisor->getLongInt() != 0
|| divisor->getOpCodeValue() == TR::iconst && divisor->getInt() != 0;
(divisor->getOpCodeValue() == TR::lconst && divisor->getLongInt() != 0)
|| (divisor->getOpCodeValue() == TR::iconst && divisor->getInt() != 0);

if (!divisorIsNonzeroConstant)
{
Expand Down
4 changes: 2 additions & 2 deletions compiler/optimizer/VPHandlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12232,8 +12232,8 @@ static TR_YesNoMaybe isArrayCompTypeValueType(OMR::ValuePropagation *vp, TR::VPC
int32_t len;
const char *sig = arrayConstraint->getClassSignature(len);

if (!sig || !arrayConstraint->isFixedClass() && sig[0] == '[' && len == 19
&& !strncmp(sig, "[Ljava/lang/Object;", 19))
if (!sig || (!arrayConstraint->isFixedClass() && sig[0] == '[' && len == 19
&& !strncmp(sig, "[Ljava/lang/Object;", 19)))
{
isValueType = TR_maybe;
}
Expand Down

0 comments on commit ba13223

Please sign in to comment.