Fix `insertFunctionArguments()` block argument order.

[csigg]

Don't print ops in generic form, let the verifier handle errors instead.

[rriddle]

Thanks for the fix!

mlir/lib/IR/FunctionSupport.cpp

if (oldArgAttrs || !argAttrs.empty()) {
     }
     migrate(originalNumArgs);
     setAllArgAttrDicts(op, newArgAttrs);
   }
 
   // Update the function type and any entry block arguments.
   op->setAttr(getTypeAttrName(), TypeAttr::get(newType));
   for (unsigned i = 0, e = argIndices.size(); i < e; ++i)
-    entry.insertArgument(argIndices[i], argTypes[i],
+    entry.insertArgument(argIndices[i] + i, argTypes[i],
                          argLocs.empty() ? Optional<Location>{} : argLocs[i]);
 }
 
 void mlir::function_like_impl::insertFunctionResults(
     Operation *op, ArrayRef<unsigned> resultIndices, TypeRange resultTypes,
     ArrayRef<DictionaryAttr> resultAttrs, unsigned originalNumResults,
     Type newType) {
   assert(resultIndices.size() == resultTypes.size());

mlir/test/IR/test-func-insert-arg.mlir

-// RUN: mlir-opt %s -test-func-insert-arg -split-input-file | FileCheck %s
-
-// CHECK: func @f(%arg0: f32 {test.A})
+// RUN: mlir-opt %s \
+// RUN:   -test-func-insert-arg \
+// RUN:   -mlir-print-op-generic \
+// RUN:   -split-input-file \
+// RUN: | FileCheck %s
+
+// CHECK: ^bb0(%arg0: i1)
+// CHECK: arg_attrs = [{test.A}]
+// CHECK: type = (i1) -> ()
 func @f() attributes {test.insert_args = [
-  [0, f32, {test.A}]]} {
+  [0, i1, {test.A}]]} {
   return
 }
 
 // -----
 
-// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B})
-func @f(%arg0: f32 {test.B}) attributes {test.insert_args = [
-  [0, f32, {test.A}]]} {
+// CHECK: ^bb0(%arg0: i1, %arg1: i2)
+// CHECK: arg_attrs = [{test.A}, {test.B}]
+// CHECK: type = (i1, i2) -> ()
+func @f(%arg0: i2 {test.B}) attributes {test.insert_args = [
+  [0, i1, {test.A}]]} {
   return
 }
 
 // -----
 
-// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B})
-func @f(%arg0: f32 {test.A}) attributes {test.insert_args = [
-  [1, f32, {test.B}]]} {
+// CHECK: ^bb0(%arg0: i1, %arg1: i2)
+// CHECK: arg_attrs = [{test.A}, {test.B}]
+// CHECK: type = (i1, i2) -> ()
+func @f(%arg0: i1 {test.A}) attributes {test.insert_args = [
+  [1, i2, {test.B}]]} {
   return
 }
 
 // -----
 
-// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B}, %arg2: f32 {test.C})
-func @f(%arg0: f32 {test.A}, %arg1: f32 {test.C}) attributes {test.insert_args = [
-  [1, f32, {test.B}]]} {
+// CHECK: ^bb0(%arg0: i1, %arg1: i2, %arg2: i3)
+// CHECK: arg_attrs = [{test.A}, {test.B}, {test.C}]
+// CHECK: type = (i1, i2, i3) -> ()
+func @f(%arg0: i1 {test.A}, %arg1: i3 {test.C}) attributes {test.insert_args = [
+  [1, i2, {test.B}]]} {
   return
 }
 
 // -----
 
-// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B}, %arg2: f32 {test.C})
-func @f(%arg0: f32 {test.B}) attributes {test.insert_args = [
-  [0, f32, {test.A}],
-  [1, f32, {test.C}]]} {
+// CHECK: ^bb0(%arg0: i1, %arg1: i2, %arg2: i3)
+// CHECK: arg_attrs = [{test.A}, {test.B}, {test.C}]
+// CHECK: type = (i1, i2, i3) -> ()
+func @f(%arg0: i2 {test.B}) attributes {test.insert_args = [
+  [0, i1, {test.A}],
+  [1, i3, {test.C}]]} {
   return
 }
 
 // -----
 
-// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B}, %arg2: f32 {test.C})
-func @f(%arg0: f32 {test.C}) attributes {test.insert_args = [
-  [0, f32, {test.A}],
-  [0, f32, {test.B}]]} {
+// CHECK: ^bb0(%arg0: i1, %arg1: i2, %arg2: i3)
+// CHECK: arg_attrs = [{test.A}, {test.B}, {test.C}]
+// CHECK: type = (i1, i2, i3) -> ()
+func @f(%arg0: i3 {test.C}) attributes {test.insert_args = [
+  [0, i1, {test.A}],
+  [0, i2, {test.B}]]} {
   return
 }