Merge pull request #298 from mairooni/fix/codegen

[fix] Fix codegen to not generate wrong close curly bracket
beehive-lab · Dec 18, 2023 · 6223dc7 · 6223dc7
2 parents 11b6e71 + ca7e8b1
commit 6223dc7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...src/main/java/uk/ac/manchester/tornado/drivers/opencl/graal/compiler/OCLBlockVisitor.java b/...src/main/java/uk/ac/manchester/tornado/drivers/opencl/graal/compiler/OCLBlockVisitor.java
@@ -514,7 +514,7 @@ private void closeBranchBlock(HIRBlock block) {
             closeIfBlock(block, dom);
         } else if (isSwitchBlockNode(block)) {
             closeSwitchBlock(block, dom);
-        } else if (isNestedIfNode(block) && (!isStartNode(block))) {
+        } else if (isNestedIfNode(block) && (!isStartNode(block) && (!isMergeBlock(block)))) {
             closeBlock(block);
         } else if (isReturnBranchWithMerge(dom, block)) {
             closeBlock(block);