fix user after free in builder and cleanup.

Author: bcardosolopes

mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td

@@ -1762,10 +1762,12 @@ def LLVM_IndirectBrOp : LLVM_TerminatorOp<"indirectbr",
     attr-dict
   }];
 
+  let skipDefaultBuilders = 1;
   let builders = [
     OpBuilder<(ins "Value":$addr,
-      CArg<"BlockRange", "{}">:$successors,
-      CArg<"ArrayRef<ValueRange>", "{}">:$succOperands)>
+      CArg<"ArrayRef<ValueRange>", "{}">:$succOperands,
+      CArg<"BlockRange", "{}">:$successors
+      )>
   ];
 }
 

mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp

@@ -3904,6 +3904,20 @@ SuccessorOperands IndirectBrOp::getSuccessorOperands(unsigned index) {
   return SuccessorOperands(getSuccOperandsMutable()[index]);
 }
 
+void IndirectBrOp::build(OpBuilder &odsBuilder, OperationState &odsState,
+                         Value addr, ArrayRef<ValueRange> succOperands,
+                         BlockRange successors) {
+  odsState.addOperands(addr);
+  for (ValueRange range : succOperands)
+    odsState.addOperands(range);
+  SmallVector<int32_t> rangeSegments;
+  for (ValueRange range : succOperands)
+    rangeSegments.push_back(range.size());
+  odsState.getOrAddProperties<Properties>().indbr_operand_segments =
+      odsBuilder.getDenseI32ArrayAttr(rangeSegments);
+  odsState.addSuccessors(successors);
+}
+
 static ParseResult parseIndirectBrOpSucessors(
     OpAsmParser &parser, Type &flagType,
     SmallVectorImpl<Block *> &succOperandBlocks,

mlir/lib/Target/LLVMIR/ModuleImport.cpp

@@ -1996,18 +1996,22 @@ LogicalResult ModuleImport::convertInstruction(llvm::Instruction *inst) {
       return failure();
 
     SmallVector<Block *> succBlocks;
-    SmallVector<ValueRange> succBlockArgs;
+    // `succBlockArgs` is storage for the block arguments ranges used in
+    // `succBlockArgsRange`, so the later references live data.
+    SmallVector<SmallVector<Value>> succBlockArgs;
+    SmallVector<ValueRange> succBlockArgsRange;
     for (auto i : llvm::seq<unsigned>(0, indBrInst->getNumSuccessors())) {
       llvm::BasicBlock *succ = indBrInst->getSuccessor(i);
       SmallVector<Value> blockArgs;
       if (failed(convertBranchArgs(indBrInst, succ, blockArgs)))
         return failure();
       succBlocks.push_back(lookupBlock(succ));
       succBlockArgs.push_back(blockArgs);
+      succBlockArgsRange.push_back(succBlockArgs.back());
     }
     Location loc = translateLoc(inst->getDebugLoc());
     auto indBrOp = builder.create<LLVM::IndirectBrOp>(
-        loc, TypeRange{}, *basePtr, succBlockArgs, succBlocks);
+        loc, *basePtr, succBlockArgsRange, succBlocks);
 
     mapNoResultOp(inst, indBrOp);
     return success();