A64: Synchronize with r15545.

src/profile-generator-inl.h

Index: src/profile-generator-inl.h
diff --git a/src/profile-generator-inl.h b/src/profile-generator-inl.h
index 6f9a60171edb9838c7d7f9c1131d74436c814e64..d92085ac32d1e284e84b6a6618b1c114aa217590 100644
--- a/src/profile-generator-inl.h
+++ b/src/profile-generator-inl.h
@@ -44,18 +44,18 @@ const char* StringsStorage::GetFunctionName(const char* name) {
 
 
 CodeEntry::CodeEntry(Logger::LogEventsAndTags tag,
-                     const char* name_prefix,
                      const char* name,
-                     int security_token_id,
+                     const char* name_prefix,
                      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) {
 }