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

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/become.h"
@@ skipping 17779 matching lines @@
   ASSERT(!IsFinalized());
   set_type_state(RawTypeParameter::kFinalizedUninstantiated);
 }
 
 
 bool TypeParameter::IsInstantiated(Genericity genericity,
                                    TrailPtr trail) const {
   switch (genericity) {
     case kAny:
       return false;
-    case kClass:
+    case kCurrentClass:
       return IsFunctionTypeParameter();
     case kFunctions:
       return IsClassTypeParameter();
     case kCurrentFunction:
       return IsClassTypeParameter() || (parent_level() > 0);
     case kParentFunctions:
       return IsClassTypeParameter() || (parent_level() == 0);
     default:
       UNREACHABLE();
   }
@@ skipping 5320 matching lines @@
   return UserTag::null();
 }
 
 
 const char* UserTag::ToCString() const {
   const String& tag_label = String::Handle(label());
   return tag_label.ToCString();
 }
 
 }  // namespace dart