A64: Synchronize with r15545.

src/profile-generator-inl.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 26 matching lines @@
   return GetFunctionName(GetName(name));
 }
 
 
 const char* StringsStorage::GetFunctionName(const char* name) {
   return strlen(name) > 0 ? name : ProfileGenerator::kAnonymousFunctionName;
 }
 
 
 CodeEntry::CodeEntry(Logger::LogEventsAndTags tag,
+                     const char* name,
                      const char* name_prefix,
-                     const char* name,
-                     int security_token_id,
                      const char* resource_name,
                      int line_number)
     : tag_(tag),
+      builtin_id_(Builtins::builtin_count),
       name_prefix_(name_prefix),
       name_(name),
       resource_name_(resource_name),
       line_number_(line_number),
       shared_id_(0),
-      security_token_id_(security_token_id),
+      script_id_(v8::Script::kNoScriptId),
       no_frame_ranges_(NULL) {
 }
 
 
 bool CodeEntry::is_js_function_tag(Logger::LogEventsAndTags tag) {
   return tag == Logger::FUNCTION_TAG
       || tag == Logger::LAZY_COMPILE_TAG
       || tag == Logger::SCRIPT_TAG
       || tag == Logger::NATIVE_FUNCTION_TAG
       || tag == Logger::NATIVE_LAZY_COMPILE_TAG
@@ skipping 23 matching lines @@
     case OTHER:
     case EXTERNAL:
       return program_entry_;
     default: return NULL;
   }
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_PROFILE_GENERATOR_INL_H_