Rename dart::Genericity::kClass to dart::Genericity::kCurrentClass to avoid

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/compiler.h"
@@ skipping 1209 matching lines @@
 void ValueGraphVisitor::VisitTypeNode(TypeNode* node) {
   const AbstractType& type = node->type();
   // Type may be malbounded, but not malformed.
   ASSERT(type.IsFinalized() && !type.IsMalformed());
   if (type.IsInstantiated()) {
     ReturnDefinition(new (Z) ConstantInstr(type));
     return;
   }
   const TokenPosition token_pos = node->token_pos();
   Value* instantiator_type_arguments = NULL;
-  if (type.IsInstantiated(kClass)) {
+  if (type.IsInstantiated(kCurrentClass)) {
     instantiator_type_arguments = BuildNullValue(token_pos);
   } else {
     instantiator_type_arguments = BuildInstantiatorTypeArguments(token_pos);
   }
   Value* function_type_arguments = NULL;
   if (type.IsInstantiated(kCurrentFunction)) {
     // TODO(regis): function_type_arguments = BuildNullValue((token_pos);
   } else {
     function_type_arguments = BuildFunctionTypeArguments(token_pos);
   }
@@ skipping 173 matching lines @@
     return;
   }
 
   EffectGraphVisitor::VisitBinaryOpNode(node);
 }
 
 
 PushArgumentInstr* EffectGraphVisitor::PushInstantiatorTypeArguments(
     const AbstractType& type,
     TokenPosition token_pos) {
-  if (type.IsInstantiated(kClass)) {
+  if (type.IsInstantiated(kCurrentClass)) {
     return PushArgument(BuildNullValue(token_pos));
   } else {
     Value* instantiator_type_args = BuildInstantiatorTypeArguments(token_pos);
     return PushArgument(instantiator_type_args);
   }
 }
 
 
 PushArgumentInstr* EffectGraphVisitor::PushFunctionTypeArguments(
     const AbstractType& type,
@@ skipping 15 matching lines @@
 
 // Used for testing incoming arguments.
 AssertAssignableInstr* EffectGraphVisitor::BuildAssertAssignable(
     TokenPosition token_pos,
     Value* value,
     const AbstractType& dst_type,
     const String& dst_name) {
   // Build the type check computation.
   Value* instantiator_type_arguments = NULL;
   Value* function_type_arguments = NULL;
-  if (dst_type.IsInstantiated(kClass)) {
+  if (dst_type.IsInstantiated(kCurrentClass)) {
     instantiator_type_arguments = BuildNullValue(token_pos);
   } else {
     instantiator_type_arguments = BuildInstantiatorTypeArguments(token_pos);
   }
   if (dst_type.IsInstantiated(kCurrentFunction)) {
     // TODO(regis): function_type_arguments = BuildNullValue(token_pos);
   } else {
     function_type_arguments = BuildFunctionTypeArguments(token_pos);
   }
 
@@ skipping 2884 matching lines @@
       graph_entry_->PruneUnreachable(graph_entry_, NULL, osr_id_, block_marks);
   ASSERT(found);
 }
 
 
 void FlowGraphBuilder::Bailout(const char* reason) const {
   parsed_function_.Bailout("FlowGraphBuilder", reason);
 }
 
 }  // namespace dart