Rename some of the enum definitions inside classes to avoid conflict with the ObjectKind enum.

vm/code_descriptors_test.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 "platform/assert.h"
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 #include "vm/ast.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/native_entry.h"
 #include "vm/parser.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 static const intptr_t kPos = Scanner::kDummyTokenIndex;
 
 
 CODEGEN_TEST_GENERATE(StackmapCodegen, test) {
   Assembler assembler;
   const String& function_name = String::ZoneHandle(String::NewSymbol("test"));
   const Function& function = Function::Handle(
-      Function::New(function_name, RawFunction::kFunction, true, false, 0));
+      Function::New(function_name, RawFunction::kRegularFunction,
+                    true, false, 0));
   function.set_result_type(Type::Handle(Type::DynamicType()));
   Class& cls = Class::ZoneHandle();
   const Script& script = Script::Handle();
   cls = Class::New(function_name, script, Scanner::kDummyTokenIndex);
   const Array& functions = Array::Handle(Array::New(1));
   functions.SetAt(0, function);
   cls.SetFunctions(functions);
   Library& lib = Library::Handle(Library::CoreLibrary());
   lib.AddClass(cls);
   ParsedFunction parsed_function(function);
@@ skipping 172 matching lines @@
   GrowableArray<const Object*> arguments;
   const Array& kNoArgumentNames = Array::Handle();
   Object& result = Object::Handle();
   result = DartEntry::InvokeStatic(function_foo, arguments, kNoArgumentNames);
   EXPECT(!result.IsError());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32 || defined(TARGET_ARCH_X64)