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

vm/stub_code_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/isolate.h"
 #include "vm/dart_entry.h"
 #include "vm/native_entry.h"
 #include "vm/native_entry_test.h"
 #include "vm/object.h"
 #include "vm/runtime_entry.h"
 #include "vm/stub_code.h"
 #include "vm/unit_test.h"
 
 #define __ assembler->
 
 namespace dart {
 
 DECLARE_RUNTIME_ENTRY(TestSmiSub);
 DECLARE_LEAF_RUNTIME_ENTRY(RawObject*, TestLeafSmiAdd, RawObject*, RawObject*);
 
 
 static Function* CreateFunction(const char* name) {
   const String& function_name = String::ZoneHandle(String::NewSymbol(name));
   Function& function = Function::ZoneHandle(
-      Function::New(function_name, RawFunction::kFunction, true, false, 0));
+      Function::New(function_name, RawFunction::kRegularFunction,
+                    true, false, 0));
   return &function;
 }
 
 
 // Test calls to stub code which calls into the runtime.
 static void GenerateCallToCallRuntimeStub(Assembler* assembler,
                                           int value1, int value2) {
   const int argc = 2;
   const Smi& smi1 = Smi::ZoneHandle(Smi::New(value1));
   const Smi& smi2 = Smi::ZoneHandle(Smi::New(value2));
@@ skipping 112 matching lines @@
   GrowableArray<const Object*>  arguments;
   const Array& kNoArgumentNames = Array::Handle();
   Smi& result = Smi::Handle();
   result ^= DartEntry::InvokeStatic(function, arguments, kNoArgumentNames);
   EXPECT_EQ((value1 - value2), result.Value());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64