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

vm/code_patcher_x64_test.cc

 // Copyright (c) 2011, 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/globals.h"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 32 matching lines @@
 }
 
 CODEGEN_TEST2_RUN(PatchStaticCall, NativePatchStaticCall, Instance::null());
 
 #define __ assembler->
 
 ASSEMBLER_TEST_GENERATE(IcDataAccess, assembler) {
   const String& function_name =
       String::ZoneHandle(String::NewSymbol("callerFunction"));
   const Function& function = Function::ZoneHandle(
-      Function::New(function_name, RawFunction::kFunction, true, false, 0));
+      Function::New(function_name, RawFunction::kRegularFunction,
+                    true, false, 0));
 
   const String& target_name = String::Handle(String::New("targetFunction"));
   ICData& ic_data = ICData::ZoneHandle(
       ICData::New(function, target_name, 15, 1));
 
   __ LoadObject(RBX, ic_data);
   __ LoadObject(R10, DartEntry::ArgumentsDescriptor(1, Array::Handle()));
   ExternalLabel target_label(
       "InlineCache", StubCode::OneArgCheckInlineCacheEntryPoint());
   __ call(&target_label);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(IcDataAccess, entry) {
   uword return_address = entry + CodePatcher::InstanceCallSizeInBytes();
   const ICData& ic_data = ICData::Handle(
       CodePatcher::GetInstanceCallIcDataAt(return_address));
   EXPECT_STREQ("targetFunction",
       String::Handle(ic_data.target_name()).ToCString());
   EXPECT_EQ(1, ic_data.num_args_tested());
   EXPECT_EQ(0, ic_data.NumberOfChecks());
 }
 
 }  // namespace dart
 
 #endif  // TARGET_ARCH_X64