Fixed compilation time measurement, restructure some code.

runtime/vm/object.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 "vm/object.h"
 
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 3635 matching lines @@
   reserve_len += OS::SNPrint(NULL, 0, function_format, name);
   const Function& parent = Function::Handle(function.parent_function());
   intptr_t written = 0;
   if (parent.IsNull()) {
     const Class& function_class = Class::Handle(function.owner());
     ASSERT(!function_class.IsNull());
     const char* class_name = String::Handle(function_class.Name()).ToCString();
     ASSERT(class_name != NULL);
     const Library& library = Library::Handle(function_class.library());
     ASSERT(!library.IsNull());
-    const char* library_name = String::Handle(library.url()).ToCString();
+    const char* library_name =  String::Handle(library.url()).ToCString();

[hausner, 2012/05/08 21:41:01]

Extra space to balance the universe?

[srdjan, 2012/05/08 21:51:31]

Rebalanced the universe.

     ASSERT(library_name != NULL);
     const char* lib_class_format =
         (library_name[0] == '\0') ? "%s%s_" : "%s_%s_";
     reserve_len +=
         OS::SNPrint(NULL, 0, lib_class_format, library_name, class_name);
     ASSERT(chars != NULL);
     *chars = reinterpret_cast<char*>(
         Isolate::Current()->current_zone()->Allocate(reserve_len + 1));
     written = OS::SNPrint(
         *chars, reserve_len, lib_class_format, library_name, class_name);
@@ skipping 2395 matching lines @@
   {
     uword size = Code::InstanceSize(pointer_offsets_length);
     RawObject* raw = Object::Allocate(cls, size, Heap::kOld);
     NoGCScope no_gc;
     result ^= raw;
     result.set_pointer_offsets_length(pointer_offsets_length);
     result.set_is_optimized(false);
   }
   return result.raw();
 }
 

[hausner, 2012/05/08 21:41:01]

Remove extra line?

[srdjan, 2012/05/08 21:51:31]

Done.

 
+
 RawCode* Code::FinalizeCode(const char* name,

[hausner, 2012/05/08 21:41:01]

Maybe an assert in this function that name is not "" when gdb or pprof info is
generated?

[srdjan, 2012/05/08 21:51:31]

Done.

                             Assembler* assembler,
                             Heap::Space space) {
   ASSERT(assembler != NULL);
 
   // Allocate the Instructions object.
   Instructions& instrs =
       Instructions::ZoneHandle(Instructions::New(assembler->CodeSize(), space));
 
   // Copy the instructions into the instruction area and apply all fixups.
   // Embedded pointers are still in handles at this point.
@@ skipping 58 matching lines @@
 RawCode* Code::FinalizeCode(const char* name, Assembler* assembler) {
   return FinalizeCode(name, assembler, Heap::kDartCode);
 }
 
 
 RawCode* Code::FinalizeStubCode(const char* name, Assembler* assembler) {
   return FinalizeCode(name, assembler, Heap::kStubCode);
 }
 
 
+RawCode* Code::FinalizeCodeForFunction(const Function& function,
+                                       Assembler* assembler) {
+  // Calling ToFullyQualifiedCString is very expensive, try to avoid it.
+  if (FLAG_generate_gdb_symbols || (Dart::pprof_symbol_generator() != NULL)) {
+    return FinalizeCode(function.ToFullyQualifiedCString(),
+                        assembler,
+                        Heap::kDartCode);
+  } else {
+    return FinalizeCode("", assembler, Heap::kDartCode);
+  }
+}
+

[hausner, 2012/05/08 21:41:01]

Save the extra empty line for a rainy day.

[srdjan, 2012/05/08 21:51:31]

Done.

+
+
 intptr_t Code::GetTokenIndexOfPC(uword pc) const {
   intptr_t token_index = -1;
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     if (descriptors.PC(i) == pc) {
       token_index = descriptors.TokenIndex(i);
       break;
     }
   }
   return token_index;
@@ skipping 3721 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart