Uniform and precise source positions for inlining

src/assembler.cc

Index: src/assembler.cc
diff --git a/src/assembler.cc b/src/assembler.cc
index 676a9febdbff695b79db82dadfa5a1958125d143..b6ca6a93370ec785d13aa47c3b11b88a31dfaf71 100644
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -1891,11 +1891,12 @@ int ConstantPoolBuilder::Emit(Assembler* assm) {
 
 // Platform specific but identical code for all the platforms.
 
-void Assembler::RecordDeoptReason(DeoptimizeReason reason, int raw_position,
-                                  int id) {
+void Assembler::RecordDeoptReason(DeoptimizeReason reason,
+                                  SourcePosition position, int id) {
   if (FLAG_trace_deopt || isolate()->is_profiling()) {
     EnsureSpace ensure_space(this);
-    RecordRelocInfo(RelocInfo::DEOPT_POSITION, raw_position);
+    RecordRelocInfo(RelocInfo::DEOPT_POSITION, position.ScriptOffset() + 2);

[Michael Starzinger, 2016/10/28 08:45:50]

As discussed offline: Could we introduce a constant for this "off-by-two" so
make it visible in the code that the assembler and the deoptimizer are in sync
in that regard?

+    RecordRelocInfo(RelocInfo::DEOPT_POSITION, -(position.InliningId() + 2));
     RecordRelocInfo(RelocInfo::DEOPT_REASON, static_cast<int>(reason));
     RecordRelocInfo(RelocInfo::DEOPT_ID, id);
   }