CpuProfiler: simplify inlined function info magic.

src/hydrogen.cc

Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index 124af1070a4f4cf6dbc9b7310fb8cb196ce9bb51..f440a1655789b2a105015fb386a36156e02268d4 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -3452,8 +3452,8 @@ HGraph::HGraph(CompilationInfo* info)
         HEnvironment(zone_, descriptor.GetEnvironmentParameterCount());
   } else {
     if (FLAG_hydrogen_track_positions) {
-      info->TraceInlinedFunction(info->shared_info(),
-                                 SourcePosition::Unknown());
+      info->TraceInlinedFunction(info->shared_info(), SourcePosition::Unknown(),
+                                 -1);

[yurys, 2015/03/11 13:05:21]

kNoPosition

[loislo, 2015/03/11 13:15:47]

done

     }
     start_environment_ =
         new(zone_) HEnvironment(NULL, info->scope(), info->closure(), zone_);
@@ -3487,8 +3487,10 @@ int HGraph::SourcePositionToScriptPosition(SourcePosition pos) {
     return pos.raw();
   }
 
-  const int id = info()->inlining_id_to_function_id()->at(pos.inlining_id());
-  return info()->inlined_function_infos()->at(id).start_position() +
+  return info()

[yurys, 2015/03/11 13:05:21]

Weird formatting.

[loislo, 2015/03/11 13:15:47]

Done.

+             ->inlined_function_infos()
+             ->at(pos.inlining_id())
+             .start_position +
          pos.position();
 }
 
@@ -7914,8 +7916,8 @@ bool HOptimizedGraphBuilder::TryInline(Handle<JSFunction> target,
 
   int function_id = 0;
   if (FLAG_hydrogen_track_positions) {
-    function_id =
-        top_info()->TraceInlinedFunction(target_shared, source_position());
+    function_id = top_info()->TraceInlinedFunction(
+        target_shared, source_position(), function_state()->inlining_id());
   }
 
   // Save the pending call context. Set up new one for the inlined function.