[compiler] Pass inlining_id via relocation info.

src/crankshaft/lithium-codegen.cc

 // Copyright 2013 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/crankshaft/lithium-codegen.h"
 
 #include <sstream>
 
 #if V8_TARGET_ARCH_IA32
 #include "src/crankshaft/ia32/lithium-ia32.h"  // NOLINT
@@ skipping 140 matching lines @@
   // issues when the stack allocated buffer goes out of scope.
   size_t length = builder.position();
   Vector<char> copy = Vector<char>::New(static_cast<int>(length) + 1);
   MemCopy(copy.start(), builder.Finalize(), copy.length());
   masm()->RecordComment(copy.start());
 }
 
 
 void LCodeGenBase::DeoptComment(const Deoptimizer::DeoptInfo& deopt_info) {
   SourcePosition position = deopt_info.position;
+  int inlining_id = deopt_info.inlining_id;
   int raw_position = position.IsUnknown() ? 0 : position.raw();
-  masm()->RecordDeoptReason(deopt_info.deopt_reason, raw_position);
+  masm()->RecordDeoptReason(deopt_info.deopt_reason, raw_position, inlining_id);
 }
 
 
 int LCodeGenBase::GetNextEmittedBlock() const {
   for (int i = current_block_ + 1; i < graph()->blocks()->length(); ++i) {
     if (!graph()->blocks()->at(i)->IsReachable()) continue;
     if (!chunk_->GetLabel(i)->HasReplacement()) return i;
   }
   return -1;
 }
@@ skipping 184 matching lines @@
   inlined_function_count_ = deoptimization_literals_.length();
 
   // Define deoptimization literals for all unoptimized code objects of inlined
   // functions. This ensures unoptimized code is kept alive by optimized code.
   AllowDeferredHandleDereference allow_shared_function_info_dereference;
   for (Handle<SharedFunctionInfo> function : chunk()->inlined_functions()) {
     DefineDeoptimizationLiteral(handle(function->code()));
   }
 }
 
-void LCodeGenBase::LogDeoptCallPosition(int pc_offset, int inlining_id) {
-  if (!info()->is_tracking_positions() || info()->IsStub()) return;
-  auto& inlined_function_infos = info()->inlined_function_infos();
-  DCHECK_LT(static_cast<size_t>(inlining_id), inlined_function_infos.size());
-  inlined_function_infos.at(inlining_id).deopt_pc_offsets.push_back(pc_offset);
-}
-
 Deoptimizer::DeoptInfo LCodeGenBase::MakeDeoptInfo(
     LInstruction* instr, Deoptimizer::DeoptReason deopt_reason) {
+  HEnterInlined* enter_inlined = instr->environment()->entry();
+  int inlining_id = enter_inlined ? enter_inlined->inlining_id() : 0;
   Deoptimizer::DeoptInfo deopt_info(instr->hydrogen_value()->position(),
-                                    deopt_reason);
-  HEnterInlined* enter_inlined = instr->environment()->entry();
-  deopt_info.inlining_id = enter_inlined ? enter_inlined->inlining_id() : 0;
+                                    deopt_reason, inlining_id);
   return deopt_info;
 }
 }  // namespace internal
 }  // namespace v8