Apply reviews

Author: Andres-Salamanca

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -1466,10 +1466,10 @@ def CIR_BrCondOp : CIR_Op<"brcond", [
 // IndirectBrOp
 //===----------------------------------------------------------------------===//
 
-def CIR_IndirectBrOp : CIR_Op<"indirectbr", [
+def CIR_IndirectBrOp : CIR_Op<"indirect_br", [
   DeclareOpInterfaceMethods<BranchOpInterface>,
-  SameVariadicOperandSize, Terminator, Pure]
-> {
+  SameVariadicOperandSize, Terminator, Pure
+]> {
   let summary = "Indirect branch";
   let description = [{
     The `cir.indirectbr` operation represents an indirect branch to one of
@@ -1486,40 +1486,27 @@ def CIR_IndirectBrOp : CIR_Op<"indirectbr", [
     Example:
 
     ```mlir
-      %0 = cir.alloca !cir.ptr<!void>, !cir.ptr<!cir.ptr<!void>>, ["ptr", init]
-      %1 = cir.block_address <@A, "A"> : !cir.ptr<!void>
-      cir.store align(8) %1, %0 : !cir.ptr<!void>, !cir.ptr<!cir.ptr<!void>>
-      %2 = cir.load align(8) %0 : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
-      cir.br ^bb1(%2 : !cir.ptr<!void>)
-    ^bb1(%3: !cir.ptr<!void>):
-      cir.indirectbr %3 : <!void>, [
-      ^bb2
-      ]
-    ```
-    or with a poison:
-
-    ```mlir
+      %0 = cir.block_address <@A, "A"> : !cir.ptr<!void>
       cir.indirectbr %0 poison : <!void>, [
-      ^bb3,
-      ^bb2
+      ^bb1
       ]
     ```
   }];
 
   let arguments = (ins
     CIR_VoidPtrType:$addr,
     UnitAttr:$poison,
-    VariadicOfVariadic<AnyType, "indbr_operand_segments">:$succOperands,
-    DenseI32ArrayAttr:$indbr_operand_segments
+    VariadicOfVariadic<AnyType, "operand_segments">:$succ_operands,
+    DenseI32ArrayAttr:$operand_segments
     );
 
   let successors = (successor VariadicSuccessor<AnySuccessor>:$successors);
   let assemblyFormat = [{
-    $addr ( `poison` $poison^ )? `:` type($addr) `,`
+    $addr ( `poison` $poison^ )? `:` qualified(type($addr)) `,`
     custom<IndirectBrOpSucessors>(ref(type($addr)),
                                   $successors,
-                                  $succOperands,
-                                  type($succOperands))
+                                  $succ_operands,
+                                  type($succ_operands))
     attr-dict
   }];
 }

clang/test/CIR/CodeGen/label-values.c

@@ -16,7 +16,7 @@ void A(void) {
 // CIR:    [[BLOCKADD:%.*]] = cir.load align(8) [[PTR]] : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
 // CIR:    cir.br ^bb1([[BLOCKADD]] : !cir.ptr<!void>)
 // CIR:  ^bb1([[PHI:%.*]]: !cir.ptr<!void> {{.*}}):  // pred: ^bb0
-// CIR:    cir.indirectbr [[PHI]] : <!void>, [
+// CIR:    cir.indirect_br [[PHI]] : !cir.ptr<!void>, [
 // CIR:    ^bb2
 // CIR:    ]
 // CIR:  ^bb2:  // pred: ^bb1
@@ -50,7 +50,7 @@ void B(void) {
 // CIR:    [[BLOCKADD:%.*]] = cir.load align(8) [[PTR]] : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
 // CIR:    cir.br ^bb2([[BLOCKADD]] : !cir.ptr<!void>)
 // CIR:  ^bb2([[PHI:%.*]]: !cir.ptr<!void> {{.*}}):  // pred: ^bb1
-// CIR:    cir.indirectbr [[PHI]] : <!void>, [
+// CIR:    cir.indirect_br [[PHI]] : !cir.ptr<!void>, [
 // CIR-NEXT:    ^bb1
 // CIR:    ]
 
@@ -82,7 +82,7 @@ void C(int x) {
 // CIR:    [[BLOCKADD:%.*]] = cir.load align(8) [[PTR]] : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
 // CIR:    cir.br ^bb1([[BLOCKADD]] : !cir.ptr<!void>)
 // CIR:  ^bb1([[PHI:%.*]]: !cir.ptr<!void> {{.*}}):  // pred: ^bb0
-// CIR:    cir.indirectbr [[PHI]] : <!void>, [
+// CIR:    cir.indirect_br [[PHI]] : !cir.ptr<!void>, [
 // CIR-NEXT:    ^bb2,
 // CIR-NEXT:    ^bb4
 // CIR:    ]
@@ -129,7 +129,7 @@ void D(void) {
 // CIR:    cir.store align(8) %[[BLK2]], %[[PTR2]] : !cir.ptr<!void>, !cir.ptr<!cir.ptr<!void>>
 // CIR:    cir.br ^bb1
 // CIR:  ^bb1([[PHI:%*.]]: !cir.ptr<!void> {{.*}}):  // pred: ^bb0
-// CIR:    cir.indirectbr [[PHI]] : <!void>, [
+// CIR:    cir.indirect_br [[PHI]] : !cir.ptr<!void>, [
 // CIR-DAG:    ^bb2,
 // CIR-DAG:    ^bb2,
 // CIR-DAG:    ^bb2
@@ -169,9 +169,9 @@ void E(void) {
   return;
 }
 
-//CIR:  cir.func dso_local @E()
+//CIR:  cir.func {{.*}} @E()
 //CIR:  ^bb1({{.*}}: !cir.ptr<!void> {{.*}}):  // no predecessors
-//CIR:    cir.indirectbr {{.*}} poison : <!void>, [
+//CIR:    cir.indirect_br {{.*}} poison : !cir.ptr<!void>, [
 //CIR-NEXT:    ^bb5,
 //CIR-NEXT:    ^bb4,
 //CIR-NEXT:    ^bb3,

clang/test/CIR/IR/indirect-br.cir

@@ -14,7 +14,7 @@ cir.func @E() {
   %6 = cir.load align(8) %0 : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
   cir.br ^bb1(%6 : !cir.ptr<!void>)
 ^bb1(%7: !cir.ptr<!void>):  // pred: ^bb0
-  cir.indirectbr %7 : <!void>, [
+  cir.indirect_br %7 : !cir.ptr<!void>, [
   ^bb5,
   ^bb4,
   ^bb3,
@@ -38,7 +38,7 @@ cir.func @E() {
   cir.return
 }
 
-// CHECK: cir.indirectbr %7 : <!void>, [
+// CHECK: cir.indirect_br %7 : !cir.ptr<!void>, [
 // CHECK:  ^bb5,
 // CHECK:  ^bb4,
 // CHECK:  ^bb3,