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

src/source-position.cc

Index: src/source-position.cc
diff --git a/src/source-position.cc b/src/source-position.cc
index e9f86db01b3ed21853073aa4a6bf9546a889513d..0907ffe8e99626fe4b6315a0b5a83d3847964ec1 100644
--- a/src/source-position.cc
+++ b/src/source-position.cc
@@ -10,25 +10,28 @@
 namespace internal {
 
 std::ostream& operator<<(std::ostream& out, const SourcePositionInfo& pos) {
-  Handle<SharedFunctionInfo> function(pos.function);
-  Handle<Script> script(Script::cast(function->script()));
-  out << "<";
-  if (script->name()->IsString()) {
-    out << String::cast(script->name())->ToCString(DISALLOW_NULLS).get();
+  Handle<SharedFunctionInfo> function;
+  if (pos.function.ToHandle(&function)) {
+    Handle<Script> script(Script::cast(function->script()));
+    out << "<";
+    if (script->name()->IsString()) {
+      out << String::cast(script->name())->ToCString(DISALLOW_NULLS).get();
+    } else {
+      out << "unknown";
+    }
+    out << ":" << pos.line + 1 << ":" << pos.column + 1 << ">";
   } else {
-    out << "unknown";
+    out << "<unknown:" << pos.position.ScriptOffset() << ">";
   }
-  out << ":" << pos.line + 1 << ":" << pos.column + 1 << ">";
   return out;
 }
 
 std::ostream& operator<<(std::ostream& out,
                          const std::vector<SourcePositionInfo>& stack) {
-  bool first = true;
-  for (const SourcePositionInfo& pos : stack) {
-    if (!first) out << " inlined at ";
-    out << pos;
-    first = false;
+  out << stack.back();
+  for (int i = static_cast<int>(stack.size()) - 2; i >= 0; --i) {
+    out << " inlined at ";
+    out << stack[i];
   }
   return out;
 }
@@ -45,48 +48,51 @@
 
 SourcePositionInfo SourcePosition::Info(
     Handle<SharedFunctionInfo> function) const {
-  SourcePositionInfo result(*this, function);
   Handle<Script> script(Script::cast(function->script()));
+  SourcePositionInfo result(*this);
   Script::PositionInfo pos;
   if (Script::GetPositionInfo(script, ScriptOffset(), &pos,
                               Script::WITH_OFFSET)) {
     result.line = pos.line;
     result.column = pos.column;
   }
+  result.function = function;
   return result;
 }
 
 std::vector<SourcePositionInfo> SourcePosition::InliningStack(
     CompilationInfo* cinfo) const {
-  SourcePosition pos = *this;
-  std::vector<SourcePositionInfo> stack;
-  while (pos.isInlined()) {
-    const auto& inl = cinfo->inlined_functions()[pos.InliningId()];
-    stack.push_back(pos.Info(inl.shared_info));
-    pos = inl.position.position;
+  if (!isInlined()) {
+    return std::vector<SourcePositionInfo>{Info(cinfo->shared_info())};
+  } else {
+    InliningPosition inl = cinfo->inlined_functions()[InliningId()].position;
+    std::vector<SourcePositionInfo> stack = inl.position.InliningStack(cinfo);
+    stack.push_back(Info(cinfo->inlined_functions()[InliningId()].shared_info));
+    return stack;
   }
-  stack.push_back(pos.Info(cinfo->shared_info()));
-  return stack;
 }
 
 std::vector<SourcePositionInfo> SourcePosition::InliningStack(
     Handle<Code> code) const {
   Handle<DeoptimizationInputData> deopt_data(
       DeoptimizationInputData::cast(code->deoptimization_data()));
-  SourcePosition pos = *this;
-  std::vector<SourcePositionInfo> stack;
-  while (pos.isInlined()) {
-    InliningPosition inl =
-        deopt_data->InliningPositions()->get(pos.InliningId());
+  if (!isInlined()) {
     Handle<SharedFunctionInfo> function(
-        deopt_data->GetInlinedFunction(inl.inlined_function_id));
-    stack.push_back(pos.Info(function));
-    pos = inl.position;
+        SharedFunctionInfo::cast(deopt_data->SharedFunctionInfo()));
+
+    return std::vector<SourcePositionInfo>{Info(function)};
+  } else {
+    InliningPosition inl = deopt_data->InliningPositions()->get(InliningId());
+    std::vector<SourcePositionInfo> stack = inl.position.InliningStack(code);
+    if (inl.inlined_function_id == -1) {
+      stack.push_back(SourcePositionInfo(*this));
+    } else {
+      Handle<SharedFunctionInfo> function(SharedFunctionInfo::cast(
+          deopt_data->LiteralArray()->get(inl.inlined_function_id)));
+      stack.push_back(Info(function));
+    }
+    return stack;
   }
-  Handle<SharedFunctionInfo> function(
-      SharedFunctionInfo::cast(deopt_data->SharedFunctionInfo()));
-  stack.push_back(pos.Info(function));
-  return stack;
 }
 
 void SourcePosition::Print(std::ostream& out,
@@ -118,8 +124,8 @@
     if (inl.inlined_function_id == -1) {
       out << *this;
     } else {
-      SharedFunctionInfo* function =
-          deopt_data->GetInlinedFunction(inl.inlined_function_id);
+      SharedFunctionInfo* function = SharedFunctionInfo::cast(
+          deopt_data->LiteralArray()->get(inl.inlined_function_id));
       Print(out, function);
     }
     out << " inlined at ";