1 files changed, 13 insertions, 10 deletions

diff --git a/deps/v8/src/profiler/profile-generator.cc b/deps/v8/src/profiler/profile-generator.cc
index 06b8a8e1e7..06edfa029e 100644
--- a/deps/v8/src/profiler/profile-generator.cc
+++ b/deps/v8/src/profiler/profile-generator.cc
@@ -941,11 +941,12 @@ void CodeEntryStorage::DecRef(CodeEntry* entry) {
   }
 }
 
-CodeMap::CodeMap(CodeEntryStorage& storage) : code_entries_(storage) {}
+InstructionStreamMap::InstructionStreamMap(CodeEntryStorage& storage)
+    : code_entries_(storage) {}
 
-CodeMap::~CodeMap() { Clear(); }
+InstructionStreamMap::~InstructionStreamMap() { Clear(); }
 
-void CodeMap::Clear() {
+void InstructionStreamMap::Clear() {
   for (auto& slot : code_map_) {
     if (CodeEntry* entry = slot.second.entry) {
       code_entries_.DecRef(entry);
@@ -958,12 +959,13 @@ void CodeMap::Clear() {
   code_map_.clear();
 }
 
-void CodeMap::AddCode(Address addr, CodeEntry* entry, unsigned size) {
+void InstructionStreamMap::AddCode(Address addr, CodeEntry* entry,
+                                   unsigned size) {
   code_map_.emplace(addr, CodeEntryMapInfo{entry, size});
   entry->set_instruction_start(addr);
 }
 
-bool CodeMap::RemoveCode(CodeEntry* entry) {
+bool InstructionStreamMap::RemoveCode(CodeEntry* entry) {
   auto range = code_map_.equal_range(entry->instruction_start());
   for (auto i = range.first; i != range.second; ++i) {
     if (i->second.entry == entry) {
@@ -975,7 +977,7 @@ bool CodeMap::RemoveCode(CodeEntry* entry) {
   return false;
 }
 
-void CodeMap::ClearCodesInRange(Address start, Address end) {
+void InstructionStreamMap::ClearCodesInRange(Address start, Address end) {
   auto left = code_map_.upper_bound(start);
   if (left != code_map_.begin()) {
     --left;
@@ -988,7 +990,8 @@ void CodeMap::ClearCodesInRange(Address start, Address end) {
   code_map_.erase(left, right);
 }
 
-CodeEntry* CodeMap::FindEntry(Address addr, Address* out_instruction_start) {
+CodeEntry* InstructionStreamMap::FindEntry(Address addr,
+                                           Address* out_instruction_start) {
   // Note that an address may correspond to multiple CodeEntry objects. An
   // arbitrary selection is made (as per multimap spec) in the event of a
   // collision.
@@ -1003,7 +1006,7 @@ CodeEntry* CodeMap::FindEntry(Address addr, Address* out_instruction_start) {
   return ret;
 }
 
-void CodeMap::MoveCode(Address from, Address to) {
+void InstructionStreamMap::MoveCode(Address from, Address to) {
   if (from == to) return;
 
   auto range = code_map_.equal_range(from);
@@ -1026,14 +1029,14 @@ void CodeMap::MoveCode(Address from, Address to) {
   code_map_.erase(range.first, it);
 }
 
-void CodeMap::Print() {
+void InstructionStreamMap::Print() {
   for (const auto& pair : code_map_) {
     base::OS::Print("%p %5d %s\n", reinterpret_cast<void*>(pair.first),
                     pair.second.size, pair.second.entry->name());
   }
 }
 
-size_t CodeMap::GetEstimatedMemoryUsage() const {
+size_t InstructionStreamMap::GetEstimatedMemoryUsage() const {
   size_t map_size = 0;
   for (const auto& pair : code_map_) {
     map_size += sizeof(pair.first) + sizeof(pair.second) +