Fixed compilation time measurement, restructure some code.

runtime/vm/stub_code_ia32_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_IA32)
 
 #include "vm/isolate.h"
 #include "vm/dart_entry.h"
 #include "vm/native_entry.h"
@@ skipping 26 matching lines @@
   __ PushObject(smi2);  // Push argument 2 smi2.
   ASSERT(kTestSmiSubRuntimeEntry.argument_count() == argc);
   __ CallRuntime(kTestSmiSubRuntimeEntry);  // Call SmiSub runtime func.
   __ AddImmediate(ESP, Immediate(argc * kWordSize));
   __ popl(EAX);  // Pop return value from return slot.
   __ leave();
   __ ret();
 }
 
 
+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));
+  return &function;
+}
+
+
 TEST_CASE(CallRuntimeStubCode) {
   extern const Function& RegisterFakeFunction(const char* name,
                                               const Code& code);
   const int value1 = 10;
   const int value2 = 20;
   const char* kName = "Test_CallRuntimeStubCode";
   Assembler _assembler_;
   GenerateCallToCallRuntimeStub(&_assembler_, value1, value2);
-  const Code& code = Code::Handle(
-      Code::FinalizeCode("Test_CallRuntimeStubCode", &_assembler_));
+  const Code& code = Code::Handle(Code::FinalizeCode(
+      *CreateFunction("Test_CallRuntimeStubCode"), &_assembler_));
   const Function& function = RegisterFakeFunction(kName, code);
   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());
 }
 
 
 // Test calls to stub code which calls a native C function.
@@ skipping 26 matching lines @@
 
 
 TEST_CASE(CallNativeCFunctionStubCode) {
   extern const Function& RegisterFakeFunction(const char* name,
                                               const Code& code);
   const int value1 = 15;
   const int value2 = 20;
   const char* kName = "Test_CallNativeCFunctionStubCode";
   Assembler _assembler_;
   GenerateCallToCallNativeCFunctionStub(&_assembler_, value1, value2);
-  const Code& code = Code::Handle(
-      Code::FinalizeCode(kName, &_assembler_));
+  const Code& code = Code::Handle(Code::FinalizeCode(
+      *CreateFunction(kName), &_assembler_));
   const Function& function = RegisterFakeFunction(kName, code);
   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_IA32