[Isolates] Merge 6700:7030 from bleeding_edge to isolates.

src/cpu-profiler-inl.h

Index: src/cpu-profiler-inl.h
===================================================================
--- src/cpu-profiler-inl.h	(revision 7006)
+++ src/cpu-profiler-inl.h	(working copy)
@@ -41,6 +41,9 @@
 
 void CodeCreateEventRecord::UpdateCodeMap(CodeMap* code_map) {
   code_map->AddCode(start, entry, size);
+  if (sfi_address != NULL) {
+    entry->set_shared_id(code_map->GetSFITag(sfi_address));
+  }
 }
 
 
@@ -54,8 +57,8 @@
 }
 
 
-void CodeAliasEventRecord::UpdateCodeMap(CodeMap* code_map) {
-  code_map->AddAlias(start, entry, code_start);
+void SFIMoveEventRecord::UpdateCodeMap(CodeMap* code_map) {
+  code_map->MoveCode(from, to);
 }