Remove parent_level field of function type parameters.

runtime/vm/kernel_to_il.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 <set>
 #include <string>
 
 #include "vm/kernel_to_il.h"
 
 #include "vm/compiler.h"
@@ skipping 2196 matching lines @@
       // directly to the `new List<T>()` factory constructor.
       instructions += LoadInstantiatorTypeArguments();
     } else {
       // Otherwise we need to resolve [TypeParameterType]s in the type
       // expression based on the current instantiator type argument vector.
       if (!type_arguments.IsInstantiated(kCurrentClass)) {
         instructions += LoadInstantiatorTypeArguments();
       } else {
         instructions += NullConstant();
       }
-      if (!type_arguments.IsInstantiated(kCurrentFunction)) {
+      if (!type_arguments.IsInstantiated(kFunctions)) {
         instructions += LoadFunctionTypeArguments();
       } else {
         instructions += NullConstant();
       }
       instructions += InstantiateTypeArguments(type_arguments);
     }
   }
   return instructions;
 }
 
@@ skipping 1604 matching lines @@
   Fragment instructions;
   Value* value = Pop();
 
   if (!dst_type.IsInstantiated(kCurrentClass)) {
     instructions += LoadInstantiatorTypeArguments();
   } else {
     instructions += NullConstant();
   }
   Value* instantiator_type_args = Pop();
 
-  if (!dst_type.IsInstantiated(kCurrentFunction)) {
+  if (!dst_type.IsInstantiated(kFunctions)) {
     instructions += LoadFunctionTypeArguments();
   } else {
     instructions += NullConstant();
   }
   Value* function_type_args = Pop();
 
   AssertAssignableInstr* instr = new (Z) AssertAssignableInstr(
       TokenPosition::kNoSource, value, instantiator_type_args,
       function_type_args, dst_type, dst_name, H.thread()->GetNextDeoptId());
   Push(instr);
@@ skipping 828 matching lines @@
 
   Fragment instructions;
   if (type.IsInstantiated()) {
     instructions += Constant(type);
   } else {
     if (!type.IsInstantiated(kCurrentClass)) {
       instructions += LoadInstantiatorTypeArguments();
     } else {
       instructions += NullConstant();
     }
-    if (!type.IsInstantiated(kCurrentFunction)) {
+    if (!type.IsInstantiated(kFunctions)) {
       instructions += LoadFunctionTypeArguments();
     } else {
       instructions += NullConstant();
     }
     instructions += InstantiateType(type);
   }
   fragment_ = instructions;
 }
 
 
@@ skipping 416 matching lines @@
       return;
     }
 
     if (!type.IsInstantiated(kCurrentClass)) {
       instructions += LoadInstantiatorTypeArguments();
     } else {
       instructions += NullConstant();
     }
     instructions += PushArgument();  // Instantiator type arguments.
 
-    if (!type.IsInstantiated(kCurrentFunction)) {
+    if (!type.IsInstantiated(kFunctions)) {
       instructions += LoadFunctionTypeArguments();
     } else {
       instructions += NullConstant();
     }
     instructions += PushArgument();  // Function type arguments.
 
     instructions += Constant(type);
     instructions += PushArgument();  // Type.
 
     instructions +=
@@ skipping 27 matching lines @@
   } else {
     instructions += PushArgument();
 
     if (!type.IsInstantiated(kCurrentClass)) {
       instructions += LoadInstantiatorTypeArguments();
     } else {
       instructions += NullConstant();
     }
     instructions += PushArgument();  // Instantiator type arguments.
 
-    if (!type.IsInstantiated(kCurrentFunction)) {
+    if (!type.IsInstantiated(kFunctions)) {
       instructions += LoadFunctionTypeArguments();
     } else {
       instructions += NullConstant();
     }
     instructions += PushArgument();  // Function type arguments.
 
     instructions += Constant(type);
     instructions += PushArgument();  // Type.
 
     instructions += InstanceCall(
@@ skipping 1369 matching lines @@
     thread->clear_sticky_error();
     return error.raw();
   }
 }
 
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)