Cache number of type arguments in class object instead of recalculating it.

runtime/vm/flow_graph_builder.cc

 // Copyright (c) 2012, 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/flow_graph_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/code_descriptors.h"
@@ skipping 2060 matching lines @@
       cls.AddClosureFunction(function);
     }
     ZoneGrowableArray<PushArgumentInstr*>* arguments =
         new ZoneGrowableArray<PushArgumentInstr*>(2);
     ASSERT(function.context_scope() != ContextScope::null());
 
     // The function type of a closure may have type arguments. In that case,
     // pass the type arguments of the instantiator.
     const Class& cls = Class::ZoneHandle(function.signature_class());
     ASSERT(!cls.IsNull());
-    const bool requires_type_arguments = cls.HasTypeArguments();
+    const bool requires_type_arguments = cls.NumTypeArguments() > 0;
     Value* type_arguments = NULL;
     if (requires_type_arguments) {
       ASSERT(cls.type_arguments_field_offset() ==
              Closure::type_arguments_offset());
       const Class& instantiator_class = Class::Handle(
           owner()->parsed_function()->function().Owner());
       type_arguments = BuildInstantiatorTypeArguments(node->token_pos(),
                                                       instantiator_class,
                                                       NULL);
       arguments->Add(PushArgument(type_arguments));
@@ skipping 58 matching lines @@
     PushArgumentInstr* push_receiver = PushArgument(receiver);
     ZoneGrowableArray<PushArgumentInstr*>* arguments =
         new ZoneGrowableArray<PushArgumentInstr*>(2);
     arguments->Add(push_receiver);
     ASSERT(function.context_scope() != ContextScope::null());
 
     // The function type of a closure may have type arguments. In that case,
     // pass the type arguments of the instantiator. Otherwise, pass null object.
     const Class& cls = Class::Handle(function.signature_class());
     ASSERT(!cls.IsNull());
-    const bool requires_type_arguments = cls.HasTypeArguments();
+    const bool requires_type_arguments = cls.NumTypeArguments() > 0;
     Value* type_arguments = NULL;
     if (requires_type_arguments) {
       const Class& instantiator_class = Class::Handle(
           owner()->parsed_function()->function().Owner());
       type_arguments = BuildInstantiatorTypeArguments(node->token_pos(),
                                                       instantiator_class,
                                                       NULL);
     } else {
       type_arguments = BuildNullValue();
     }
@@ skipping 127 matching lines @@
 void EffectGraphVisitor::VisitCloneContextNode(CloneContextNode* node) {
   Value* context = Bind(new CurrentContextInstr());
   Value* clone = Bind(new CloneContextInstr(node->token_pos(), context));
   AddInstruction(new StoreContextInstr(clone));
 }
 
 
 Value* EffectGraphVisitor::BuildObjectAllocation(
     ConstructorCallNode* node) {
   const Class& cls = Class::ZoneHandle(node->constructor().Owner());
-  const bool requires_type_arguments = cls.HasTypeArguments();
+  const bool requires_type_arguments = cls.NumTypeArguments() > 0;
 
   // In checked mode, if the type arguments are uninstantiated, they may need to
   // be checked against declared bounds at run time.
   Definition* allocation = NULL;
   if (FLAG_enable_type_checks &&
       requires_type_arguments &&
       !node->type_arguments().IsNull() &&
       !node->type_arguments().IsInstantiated() &&
       node->type_arguments().IsBounded()) {
     ZoneGrowableArray<PushArgumentInstr*>* allocate_arguments =
@@ skipping 232 matching lines @@
                                                type_arguments,
                                                instantiator_class,
                                                instantiator_value));
 }
 
 
 void EffectGraphVisitor::BuildConstructorTypeArguments(
     ConstructorCallNode* node,
     ZoneGrowableArray<PushArgumentInstr*>* call_arguments) {
   const Class& cls = Class::ZoneHandle(node->constructor().Owner());
-  ASSERT(cls.HasTypeArguments() && !node->constructor().IsFactory());
+  ASSERT((cls.NumTypeArguments() > 0) && !node->constructor().IsFactory());
   if (node->type_arguments().IsNull() ||
       node->type_arguments().IsInstantiated()) {
     Value* type_arguments_val = Bind(new ConstantInstr(node->type_arguments()));
     call_arguments->Add(PushArgument(type_arguments_val));
 
     // No instantiator required.
     Value* instantiator_val = Bind(new ConstantInstr(
         Smi::ZoneHandle(Smi::New(StubCode::kNoInstantiator))));
     call_arguments->Add(PushArgument(instantiator_val));
     return;
@@ skipping 1267 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart