Fix several bugs in closure conversion.

pkg/kernel/testcases/closures/arity.dart.expect

Index: pkg/kernel/testcases/closures/arity.dart.expect
diff --git a/pkg/kernel/testcases/closures/arity.dart.expect b/pkg/kernel/testcases/closures/arity.dart.expect
new file mode 100644
index 0000000000000000000000000000000000000000..5a89267f75c00333259a9377b4eb06e7e0bb23f8
--- /dev/null
+++ b/pkg/kernel/testcases/closures/arity.dart.expect
@@ -0,0 +1,27 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+static method main() → dynamic {
+  dynamic closures = <dynamic>[MakeClosure<(dynamic, dynamic, [dynamic]) → dynamic>(self::closure#main#function, null), MakeClosure<(dynamic, dynamic, dynamic) → dynamic>(self::closure#main#function#1, null), MakeClosure<(dynamic, dynamic, {z: dynamic}) → dynamic>(self::closure#main#function#2, null), MakeClosure<(dynamic, dynamic, dynamic, dynamic, dynamic) → dynamic>(self::closure#main#function#3, null)];
+  for (dynamic c in closures) {
+    core::bool ok = false;
+    try {
+      c.call(1, 2, 3, 4);
+    }
+    on core::NoSuchMethodError catch(final core::NoSuchMethodError _) {
+      ok = true;
+    }
+    if(!ok) {
+      throw core::Exception::•("Expected an error!");
+    }
+  }
+  (MakeClosure<(dynamic, dynamic, [dynamic]) → dynamic>(self::closure#main#function#4, null)).call(1, 2);
+  (MakeClosure<(dynamic, dynamic, [dynamic]) → dynamic>(self::closure#main#function#5, null)).call(1, 2, 3);
+}
+static method closure#main#function(Vector #contextParameter, dynamic x, dynamic y, [dynamic z]) → dynamic {}
+static method closure#main#function#1(Vector #contextParameter, dynamic x, dynamic y, dynamic z) → dynamic {}
+static method closure#main#function#2(Vector #contextParameter, dynamic x, dynamic y, {dynamic z}) → dynamic {}
+static method closure#main#function#3(Vector #contextParameter, dynamic x, dynamic y, dynamic z, dynamic w, dynamic v) → dynamic {}
+static method closure#main#function#4(Vector #contextParameter, dynamic x, dynamic y, [dynamic z]) → dynamic {}
+static method closure#main#function#5(Vector #contextParameter, dynamic x, dynamic y, [dynamic z]) → dynamic {}