[CIR][Interfaces] Temporarily disable verifier to get out of circular dep

Author: lanza

clang/lib/CIR/Interfaces/CIRLoopOpInterface.cpp

@@ -45,10 +45,11 @@ void LoopOpInterface::getLoopOpSuccessorRegions(
 
 /// Verify invariants of the LoopOpInterface.
 LogicalResult detail::verifyLoopOpInterface(Operation *op) {
-  auto loopOp = cast<LoopOpInterface>(op);
-  if (!isa<ConditionOp>(loopOp.getCond().back().getTerminator()))
-    return op->emitOpError(
-        "expected condition region to terminate with 'cir.condition'");
+  // FIXME: fix this so the conditionop isn't requiring MLIRCIR
+  // auto loopOp = cast<LoopOpInterface>(op);
+  // if (!isa<ConditionOp>(loopOp.getCond().back().getTerminator()))
+  //   return op->emitOpError(
+  //       "expected condition region to terminate with 'cir.condition'");
   return success();
 }
 

clang/test/CIR/IR/invalid.cir

@@ -303,23 +303,6 @@ cir.func @cast24(%p : !u32i) {
 
 // -----
 
-#false = #cir.bool<false> : !cir.bool
-#true = #cir.bool<true> : !cir.bool
-cir.func @b0() {
-  cir.scope {
-    cir.while {  // expected-error {{expected condition region to terminate with 'cir.condition'}}
-      cir.yield
-    } do {
-      cir.br ^bb1
-    ^bb1:
-      cir.return
-    }
-  }
-  cir.return
-}
-
-// -----
-
 !u32i = !cir.int<u, 32>
 !u8i = !cir.int<u, 8>
 module {
@@ -807,27 +790,3 @@ cir.func @const_type_mismatch() -> () {
     %2 = cir.const(#cir.int<0> : !s8i) : !u8i
     cir.return
 }
-
-// -----
-
-cir.func @invalid_cond_region_terminator(%arg0 : !cir.bool) -> !cir.void {
-  cir.do { // expected-error {{op expected condition region to terminate with 'cir.condition'}}
-    cir.yield
-  } while {
-    cir.yield
-  }
-  cir.return
-}
-
-// -----
-
-cir.func @invalidConditionTerminator (%arg0 : !cir.bool) -> !cir.void {
-  cir.for : cond { // expected-error {{op expected condition region to terminate with 'cir.condition'}}
-    cir.yield
-  } body {
-    cir.yield
-  } step {
-    cir.yield
-  }
-  cir.return
-}

clang/test/CIR/IR/invalid_xfail.cir

@@ -0,0 +1,42 @@
+// Test attempts to build bogus CIR
+// RUN: cir-opt %s -verify-diagnostics -split-input-file
+// XFAIL: *
+
+#false = #cir.bool<false> : !cir.bool
+#true = #cir.bool<true> : !cir.bool
+cir.func @b0() {
+  cir.scope {
+    cir.while {  // expected-error {{expected condition region to terminate with 'cir.condition'}}
+      cir.yield
+    } do {
+      cir.br ^bb1
+    ^bb1:
+      cir.return
+    }
+  }
+  cir.return
+}
+
+// -----
+
+cir.func @invalid_cond_region_terminator(%arg0 : !cir.bool) -> !cir.void {
+  cir.do { // expected-error {{op expected condition region to terminate with 'cir.condition'}}
+    cir.yield
+  } while {
+    cir.yield
+  }
+  cir.return
+}
+
+// -----
+
+cir.func @invalidConditionTerminator (%arg0 : !cir.bool) -> !cir.void {
+  cir.for : cond { // expected-error {{op expected condition region to terminate with 'cir.condition'}}
+    cir.yield
+  } body {
+    cir.yield
+  } step {
+    cir.yield
+  }
+  cir.return
+}