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

vm/unit_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 <stdio.h>
 
 #include "vm/unit_test.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 123 matching lines @@
   if (tag == kCanonicalizeUrl) {
     return url;
   }
   return Api::Success(Isolate::Current());
 }
 
 
 uword AssemblerTest::Assemble() {
   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));
   const Code& code = Code::Handle(Code::FinalizeCode(function, assembler_));
   if (FLAG_disassemble) {
     OS::Print("Code for test '%s' {\n", name_);
     const Instructions& instructions =
         Instructions::Handle(code.instructions());
     uword start = instructions.EntryPoint();
     Disassembler::Disassemble(start, start + assembler_->CodeSize());
     OS::Print("}\n");
   }
   const Instructions& instructions = Instructions::Handle(code.instructions());
   return instructions.EntryPoint();
 }
 
 
 CodeGenTest::CodeGenTest(const char* name)
   : function_(Function::ZoneHandle()),
     node_sequence_(new SequenceNode(Scanner::kDummyTokenIndex,
                                     new LocalScope(NULL, 0, 0))),
     default_parameter_values_(Array::ZoneHandle()) {
   ASSERT(name != NULL);
   const String& function_name = String::ZoneHandle(String::NewSymbol(name));
   function_ = Function::New(
-      function_name, RawFunction::kFunction, true, false, 0);
+      function_name, RawFunction::kRegularFunction, true, false, 0);
   function_.set_result_type(Type::Handle(Type::DynamicType()));
   // Add function to a class and that class to the class dictionary so that
   // frame walking can be used.
   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());
@@ skipping 40 matching lines @@
 
 bool CompilerTest::TestCompileFunction(const Function& function) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   ASSERT(ClassFinalizer::AllClassesFinalized());
   const Error& error = Error::Handle(Compiler::CompileFunction(function));
   return error.IsNull();
 }
 
 }  // namespace dart