Uniform and precise source positions for inlining

src/compilation-info.h

 // Copyright 2016 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.
 
 #ifndef V8_COMPILATION_INFO_H_
 #define V8_COMPILATION_INFO_H_
 
 #include <memory>
 
 #include "src/compilation-dependencies.h"
@@ skipping 265 matching lines @@
   bool has_simple_parameters();
 
   struct InlinedFunctionHolder {
     Handle<SharedFunctionInfo> shared_info;
 
     // Root that holds the unoptimized code of the inlined function alive
     // (and out of reach of code flushing) until we finish compilation.
     // Do not remove.
     Handle<Code> inlined_code_object_root;
 
+    InliningPosition position;
+
     InlinedFunctionHolder(Handle<SharedFunctionInfo> inlined_shared_info,
-                          Handle<Code> inlined_code_object_root)
+                          Handle<Code> inlined_code_object_root,
+                          SourcePosition pos)
         : shared_info(inlined_shared_info),
-          inlined_code_object_root(inlined_code_object_root) {}
+          inlined_code_object_root(inlined_code_object_root) {
+      position.position = pos;
+      // initialized when generating the deoptimization literals
+      position.inlined_function_id = -1;
+    }
+
+    void RegisterInlinedFunctionId(size_t inlined_function_id) {
+      position.inlined_function_id = static_cast<int>(inlined_function_id);
+    }
   };
 
   typedef std::vector<InlinedFunctionHolder> InlinedFunctionList;
-  InlinedFunctionList const& inlined_functions() const {
-    return inlined_functions_;
-  }
+  InlinedFunctionList& inlined_functions() { return inlined_functions_; }
 
-  void AddInlinedFunction(Handle<SharedFunctionInfo> inlined_function);
+  // Returns the inlining id for source position tracking.
+  int AddInlinedFunction(Handle<SharedFunctionInfo> inlined_function,
+                         SourcePosition pos);
 
   std::unique_ptr<char[]> GetDebugName() const;
 
   Code::Kind output_code_kind() const;
 
   StackFrame::Type GetOutputStackFrameType() const;
 
   int GetDeclareGlobalsFlags() const;
 
   SourcePositionTableBuilder::RecordingMode SourcePositionRecordingMode() const;
@@ skipping 68 matching lines @@
 
   Vector<const char> debug_name_;
 
   DISALLOW_COPY_AND_ASSIGN(CompilationInfo);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILATION_INFO_H_