extend to OR

Author: akiramenai

llvm/lib/Target/EVM/EVMPeephole.cpp

@@ -45,11 +45,13 @@ bool EVMPeephole::runOnMachineFunction(MachineFunction &MF) {
   return Changed;
 }
 
-static bool isNegatadAndJumpedOn(const MachineBasicBlock &MBB,
+static bool isNegatedAndJumpedOn(const MachineBasicBlock &MBB,
                                  MachineBasicBlock::const_iterator I) {
   if (I == MBB.end() || I->getOpcode() != EVM::ISZERO_S)
     return false;
   ++I;
+  while (I != MBB.end() && I->getOpcode() == EVM::OR_S)
+    ++I;
   if (I == MBB.end())
     return false;
   if (I->getOpcode() == EVM::PseudoJUMPI)
@@ -67,23 +69,23 @@ bool EVMPeephole::optimizeConditionaJumps(MachineBasicBlock &MBB) const {
   while (I != MBB.end()) {
     // Fold ISZERO ISZERO to nothing, only if it's a predicate to JUMPI.
     if (I->getOpcode() == EVM::ISZERO_S &&
-        isNegatadAndJumpedOn(MBB, std::next(I))) {
+        isNegatedAndJumpedOn(MBB, std::next(I))) {
       std::next(I)->eraseFromParent();
       I->eraseFromParent();
       return true;
     }
 
     // Fold EQ ISZERO to SUB, only if it's a predicate to JUMPI.
     if (I->getOpcode() == EVM::EQ_S &&
-        isNegatadAndJumpedOn(MBB, std::next(I))) {
+        isNegatedAndJumpedOn(MBB, std::next(I))) {
       I->setDesc(TII->get(EVM::SUB_S));
       std::next(I)->eraseFromParent();
       return true;
     }
 
     // Fold SUB ISZERO to EQ, only if it's a predicate to JUMPI.
     if (I->getOpcode() == EVM::SUB_S &&
-        isNegatadAndJumpedOn(MBB, std::next(I))) {
+        isNegatedAndJumpedOn(MBB, std::next(I))) {
       I->setDesc(TII->get(EVM::EQ_S));
       std::next(I)->eraseFromParent();
       return true;