Merged: [cpu-profiler] use new source position information for deoptimization in cpu profiler

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 366 matching lines @@
   }
   code->set_deoptimization_data(*data);
 }
 
 
 void LCodeGenBase::PopulateDeoptimizationLiteralsWithInlinedFunctions() {
   DCHECK_EQ(0, deoptimization_literals_.length());
   for (CompilationInfo::InlinedFunctionHolder& inlined :
        info()->inlined_functions()) {
     if (!inlined.shared_info.is_identical_to(info()->shared_info())) {
-      inlined.RegisterInlinedFunctionId(deoptimization_literals_.length());
-      DefineDeoptimizationLiteral(inlined.shared_info);
+      int index = DefineDeoptimizationLiteral(inlined.shared_info);
+      inlined.RegisterInlinedFunctionId(index);
     }
   }
   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.
   for (const CompilationInfo::InlinedFunctionHolder& inlined :
        info()->inlined_functions()) {
     if (!inlined.shared_info.is_identical_to(info()->shared_info())) {
       DefineDeoptimizationLiteral(inlined.inlined_code_object_root);
     }
   }
 }
 
 Deoptimizer::DeoptInfo LCodeGenBase::MakeDeoptInfo(
     LInstruction* instr, DeoptimizeReason deopt_reason, int deopt_id) {
   Deoptimizer::DeoptInfo deopt_info(instr->hydrogen_value()->position(),
                                     deopt_reason, deopt_id);
   return deopt_info;
 }
 
 }  // namespace internal
 }  // namespace v8