Alternative fix for .call invocation of closures.

runtime/vm/object.cc

Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc	(revision 33688)
+++ runtime/vm/object.cc	(working copy)
@@ -2254,8 +2254,7 @@
   };
 
   ASSERT(kind == RawFunction::kNoSuchMethodDispatcher ||
-         kind == RawFunction::kInvokeFieldDispatcher ||
-         kind == RawFunction::kInvokeClosureDispatcher);
+         kind == RawFunction::kInvokeFieldDispatcher);
   Function& dispatcher = Function::Handle();
   Array& cache = Array::Handle(invocation_dispatcher_cache());
   ASSERT(!cache.IsNull());
@@ -4657,8 +4656,7 @@
 
 RawArray* Function::saved_args_desc() const {
   ASSERT(kind() == RawFunction::kNoSuchMethodDispatcher ||
-         kind() == RawFunction::kInvokeFieldDispatcher ||
-         kind() == RawFunction::kInvokeClosureDispatcher);
+         kind() == RawFunction::kInvokeFieldDispatcher);
   const Object& obj = Object::Handle(raw_ptr()->data_);
   ASSERT(obj.IsArray());
   return Array::Cast(obj).raw();
@@ -4667,8 +4665,7 @@
 
 void Function::set_saved_args_desc(const Array& value) const {
   ASSERT(kind() == RawFunction::kNoSuchMethodDispatcher ||
-         kind() == RawFunction::kInvokeFieldDispatcher ||
-         kind() == RawFunction::kInvokeClosureDispatcher);
+         kind() == RawFunction::kInvokeFieldDispatcher);
   ASSERT(raw_ptr()->data_ == Object::null());
   set_data(value);
 }
@@ -4817,9 +4814,6 @@
     case RawFunction::kInvokeFieldDispatcher:
       return "kInvokeFieldDispatcher";
       break;
-    case RawFunction::kInvokeClosureDispatcher:
-      return "kInvokeClosureDispatcher";
-      break;
     default:
       UNREACHABLE();
       return NULL;
@@ -6072,9 +6066,6 @@
     case RawFunction::kInvokeFieldDispatcher:
       kind_str = "invoke-field-dispatcher";
       break;
-    case RawFunction::kInvokeClosureDispatcher:
-      kind_str = "invoke-closure-dispatcher";
-      break;
     default:
       UNREACHABLE();
   }
@@ -6106,9 +6097,7 @@
   } else if (IsImplicitClosureFunction()) {
     id = cls.FindImplicitClosureFunctionIndex(*this);
     selector = "implicit_closures";
-  } else if (IsNoSuchMethodDispatcher() ||
-             IsInvokeFieldDispatcher() ||
-             IsInvokeClosureDispatcher()) {
+  } else if (IsNoSuchMethodDispatcher() || IsInvokeFieldDispatcher()) {
     id = cls.FindInvocationDispatcherFunctionIndex(*this);
     selector = "dispatchers";
   } else {