diff options
Diffstat (limited to 'src/passes/OptimizeInstructions.cpp')
| -rw-r--r-- | src/passes/OptimizeInstructions.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp index 869512774..79315ac6d 100644 --- a/src/passes/OptimizeInstructions.cpp +++ b/src/passes/OptimizeInstructions.cpp @@ -1591,14 +1591,22 @@ private: return inner; } } - if (ExpressionAnalyzer::equal(inner->right, outer->left)) { + if (ExpressionAnalyzer::equal(inner->right, outer->left) && + canReorder(outer->left, inner->left)) { // x ^ (y ^ x) ==> y + // (note that we need the check for reordering here because if + // e.g. y writes to a local that x reads, the second appearance + // of x would be different from the first) if (outer->op == Abstract::getBinary(type, Abstract::Xor)) { return inner->left; } // x & (y & x) ==> y & x // x | (y | x) ==> y | x + // (here we need the check for reordering for the more obvious + // reason that previously x appeared before y, and now y appears + // first; or, if we tried to emit x [&|] y here, reversing the + // order, we'd be in the same situation as the previous comment) if (outer->op == Abstract::getBinary(type, Abstract::And) || outer->op == Abstract::getBinary(type, Abstract::Or)) { return inner; @@ -1627,7 +1635,9 @@ private: return inner; } } - if (ExpressionAnalyzer::equal(inner->left, outer->right)) { + // See comments in the parallel code earlier about ordering here. + if (ExpressionAnalyzer::equal(inner->left, outer->right) && + canReorder(inner->left, inner->right)) { // (x ^ y) ^ x ==> y if (outer->op == Abstract::getBinary(type, Abstract::Xor)) { return inner->right; |