Pass a second type argument vector to all type instantiation calls in the VM.

runtime/vm/object_service.cc

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/debugger.h"
 #include "vm/disassembler.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
@@ skipping 202 matching lines @@
       type_arg = TypeAt(i);
       jsarr.AddValue(type_arg);
     }
   }
   if (!IsInstantiated()) {
     JSONArray jsarr(&jsobj, "_instantiations");
     Array& prior_instantiations = Array::Handle(instantiations());
     ASSERT(prior_instantiations.Length() > 0);  // Always at least a sentinel.
     TypeArguments& type_args = TypeArguments::Handle();
     intptr_t i = 0;
-    while (true) {
-      if (prior_instantiations.At(i) == Smi::New(StubCode::kNoInstantiator)) {
-        break;
-      }
+    while (prior_instantiations.At(i) != Smi::New(StubCode::kNoInstantiator)) {
       JSONObject instantiation(&jsarr);
       type_args ^= prior_instantiations.At(i);
-      instantiation.AddProperty("instantiator", type_args, true);
+      instantiation.AddProperty("instantiatorTypeArguments", type_args, true);
       type_args ^= prior_instantiations.At(i + 1);
+      instantiation.AddProperty("functionTypeArguments", type_args, true);
+      type_args ^= prior_instantiations.At(i + 2);
       instantiation.AddProperty("instantiated", type_args, true);
-      i += 2;
+      i += StubCode::kInstantiationSizeInWords;
     }
   }
 }
 
 
 void PatchClass::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ skipping 1339 matching lines @@
   jsobj.AddProperty("mirrorReferent", referent_handle);
 }
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 #endif
 
 }  // namespace dart