Uniform and precise source positions for inlining

src/profiler/profile-generator.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/profiler/profile-generator.h"
 
 #include "src/base/adapters.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/global-handles.h"
@@ skipping 163 matching lines @@
   set_position(shared->start_position());
   set_bailout_reason(GetBailoutReason(shared->disable_optimization_reason()));
 }
 
 CpuProfileDeoptInfo CodeEntry::GetDeoptInfo() {
   DCHECK(has_deopt_info());
 
   CpuProfileDeoptInfo info;
   info.deopt_reason = deopt_reason_;
   DCHECK_NE(kNoDeoptimizationId, deopt_id_);
+  size_t position = static_cast<size_t>(deopt_position_.ScriptOffset());
   if (deopt_inlined_frames_.find(deopt_id_) == deopt_inlined_frames_.end()) {
-    info.stack.push_back(CpuProfileDeoptFrame(
-        {script_id_, position_ + deopt_position_.position()}));
+    info.stack.push_back(CpuProfileDeoptFrame({script_id_, position}));
   } else {
-    size_t deopt_position = deopt_position_.raw();
     // Copy stack of inlined frames where the deopt happened.
     std::vector<DeoptInlinedFrame>& frames = deopt_inlined_frames_[deopt_id_];
+    bool first = true;
     for (DeoptInlinedFrame& inlined_frame : base::Reversed(frames)) {
-      info.stack.push_back(CpuProfileDeoptFrame(
-          {inlined_frame.script_id, deopt_position + inlined_frame.position}));
-      deopt_position = 0;  // Done with innermost frame.
+      info.stack.push_back(
+          CpuProfileDeoptFrame({inlined_frame.script_id,
+                                first ? position : inlined_frame.position}));
+      first = false;  // Done with innermost frame.
     }
   }
   return info;
 }
 
 
 void ProfileNode::CollectDeoptInfo(CodeEntry* entry) {
   deopt_infos_.push_back(entry->GetDeoptInfo());
   entry->clear_deopt_info();
 }
@@ skipping 579 matching lines @@
     case EXTERNAL:
       return CodeEntry::program_entry();
     case IDLE:
       return CodeEntry::idle_entry();
     default: return NULL;
   }
 }
 
 }  // namespace internal
 }  // namespace v8