Update break/continue test to use contribution of function mask.

2013-05-21 10:52:38 -04:00
parent 4ea02c59d8
commit 403d9e1059
2 changed files with 9 additions and 1 deletions
--- a/ctx.cpp
+++ b/ctx.cpp
@@ -841,6 +841,9 @@ FunctionEmitContext::jumpIfAllLoopLanesAreDone(llvm::BasicBlock *target) {
    if (breakLanesPtr == NULL) {
        llvm::Value *continued = LoadInst(continueLanesPtr,
                                          "continue_lanes");
+        continued = BinaryOperator(llvm::Instruction::And,
+                                   continued, GetFunctionMask(),
+                                   "continued&func");
        allDone = MasksAllEqual(continued, blockEntryMask);
    }
    else {
@@ -860,6 +863,10 @@ FunctionEmitContext::jumpIfAllLoopLanesAreDone(llvm::BasicBlock *target) {
            finishedLanes = BinaryOperator(llvm::Instruction::Or, finishedLanes,
                                           continued, "returned|breaked|continued");
        }
+        
+        finishedLanes = BinaryOperator(llvm::Instruction::And,
+                                       finishedLanes, GetFunctionMask(),
+                                       "finished&func");

        // Do we match the mask at loop or switch statement entry?
        allDone = MasksAllEqual(finishedLanes, blockEntryMask);