doWhile: start using the negateCondition attribute

vmihalko · Mar 14, 2024 · b703560 · b703560
1 parent 2e60dee
commit b703560
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/parser/parseBreaks.cpp b/parser/parseBreaks.cpp
@@ -167,16 +167,9 @@ void parseLoop(Func* func, const llvm::Loop *loop) {
     auto doWhileTerminatorInst = llvm::dyn_cast<llvm::BranchInst>(
                             loop->getLoopLatch()->getTerminator());
 
-    auto whileCondIsTrueBlock = llvm::dyn_cast<llvm::BasicBlock>(doWhileTerminatorInst->getOperand(2));
     Expr* cmp =  func->getExpr(
                         doWhileTerminatorInst->getCondition()
                             );
-    if ( whileCondIsTrueBlock != loop->getHeader() ) {
-            auto cmpExpr = llvm::dyn_cast<CmpExpr>( cmp );
-            cmpExpr->comparsion = getComparePredicate(negateCmpInst(llvm::dyn_cast<llvm::CmpInst>(doWhileTerminatorInst->getCondition())));
-
-            llvm::errs() << "flipped\n";
-    }
     // do { goto loop.header() } while (c)
 
     // #2 create the doWhile body `do { goto loopHeader; }`
@@ -193,6 +186,12 @@ void parseLoop(Func* func, const llvm::Loop *loop) {
     loopPreheader->addOwnership(std::move( gotoExpr ));
     loopPreheader->addOwnership(std::move( list ));
 
+    auto whileCondIsTrueBlock = llvm::dyn_cast<llvm::BasicBlock>(doWhileTerminatorInst->getOperand(2));
+    auto doWhile = std::make_unique<DoWhile>(createListOfOneGoto( func->getBlock( loop->getLoopLatch() ),
+                                                                    doWhileBody, true /*isLoop = true*/),
+                                                cmp,
+                                                whileCondIsTrueBlock != loop->getHeader());
+
     // #4 it's safe to inline loopheader:
     // loopHeader.succ_first() == loopLatch, loopHeader.succ_second() = loopPreheader
     // we transform the edge from the loopLatch to loopHeader into to do{}while() block

diff --git a/writer/ExprWriter.cpp b/writer/ExprWriter.cpp
@@ -508,6 +508,10 @@ void ExprWriter::visit(DoWhile& expr) {
     indentCount--;
     indent();
     ss << "} while (";
+    if (expr.negateCondition)
+        ss << " !(";
     expr.cond->accept(*this);
+    if (expr.negateCondition)
+        ss << " )";
     ss << ")";
 }