From 45244c8115fdd34729249a67748ad2f1fc8105f7 Mon Sep 17 00:00:00 2001
From: Daniel Haag <121057143+denialhaag@users.noreply.github.com>
Date: Fri, 5 Jun 2026 14:26:41 +0200
Subject: [PATCH] Mark SCF operations as IsolatedFromAbove

---
 include/jeff/IR/JeffOps.td            |  8 ++++----
 unittests/IR/test_parse_switch_op.cpp | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/jeff/IR/JeffOps.td b/include/jeff/IR/JeffOps.td
index f76626b..49b290a 100644
--- a/include/jeff/IR/JeffOps.td
+++ b/include/jeff/IR/JeffOps.td
@@ -1882,7 +1882,7 @@ def FloatArrayCreateOp : FloatArray_Op<"float_array_create", []> {
 
 class SCF_Op<string mnemonic, list<Trait> traits = []> : Jeff_Op<mnemonic, traits # [SCFOperation]>;
 
-def SwitchOp : SCF_Op<"switch", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
+def SwitchOp : SCF_Op<"switch", [IsolatedFromAbove, SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
     let summary = "Multi-way branch on an integer selector";
     let description = [{
       The `jeff.switch` operation dispatches on an integer selector to one of
@@ -1982,7 +1982,7 @@ def SwitchOp : SCF_Op<"switch", [SingleBlockImplicitTerminator<"jeff::YieldOp">]
     let hasRegionVerifier = 1;
 }
 
-def ForOp : SCF_Op<"for", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
+def ForOp : SCF_Op<"for", [IsolatedFromAbove, SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
     let summary = "Counted for loop with iteration arguments";
     let description = [{
       The `jeff.for` operation represents a counted loop over a half-open
@@ -2079,7 +2079,7 @@ def ForOp : SCF_Op<"for", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
     let hasRegionVerifier = 1;
 }
 
-def WhileOp : SCF_Op<"while", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
+def WhileOp : SCF_Op<"while", [IsolatedFromAbove, SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
     let summary = "While loop with iteration arguments";
     let description = [{
       The `jeff.while` operation represents a loop that repeats while a
@@ -2182,7 +2182,7 @@ def WhileOp : SCF_Op<"while", [SingleBlockImplicitTerminator<"jeff::YieldOp">]>
     let hasRegionVerifier = 1;
 }
 
-def DoWhileOp : SCF_Op<"doWhile", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
+def DoWhileOp : SCF_Op<"doWhile", [IsolatedFromAbove, SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
     let summary = "Do-while loop with iteration arguments";
     let description = [{
       The `jeff.doWhile` operation represents a loop that repeats while a
diff --git a/unittests/IR/test_parse_switch_op.cpp b/unittests/IR/test_parse_switch_op.cpp
index 1abc88c..f4014b1 100644
--- a/unittests/IR/test_parse_switch_op.cpp
+++ b/unittests/IR/test_parse_switch_op.cpp
@@ -120,19 +120,19 @@ TEST_F(SwitchOpTest, DecoupledInValueAndResultTypes) {
 TEST_F(SwitchOpTest, Nested) {
     const std::string src = R"MLIR(
       func.func @f(%sel: i32, %a: i32) -> i32 {
-        %r = jeff.switch (%sel, %a) : (i32, i32) -> (i32)
-        case 0 args(%x) {
-          %s = jeff.switch (%sel, %x) : (i32, i32) -> (i32)
-          case 0 args(%xx) {
-            jeff.yield %xx : i32
+        %r = jeff.switch (%sel, %sel, %a) : (i32, i32, i32) -> (i32)
+        case 0 args(%sel_arg, %a_arg) {
+          %s = jeff.switch (%sel_arg, %a_arg) : (i32, i32) -> (i32)
+          case 0 args(%a_arg_arg) {
+            jeff.yield %a_arg_arg : i32
           }
-          default args(%xx) {
-            jeff.yield %xx : i32
+          default args(%a_arg_arg) {
+            jeff.yield %a_arg_arg : i32
           }
           jeff.yield %s : i32
         }
-        default args(%x) {
-          jeff.yield %x : i32
+        default args(%sel_arg, %a_arg) {
+          jeff.yield %a_arg : i32
         }
         return %r : i32
       }