CpuProfiler: move InlinedFunctionInfo class from HGraphBuilder to CompilationInfo.

src/compiler.h

 // Copyright 2012 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_COMPILER_H_
 #define V8_COMPILER_H_
 
 #include "src/allocation.h"
 #include "src/ast.h"
 #include "src/bailout-reason.h"
@@ skipping 12 matching lines @@
   ONLY_SINGLE_FUNCTION_LITERAL  // Only a single FunctionLiteral expression.
 };
 
 struct OffsetRange {
   OffsetRange(int from, int to) : from(from), to(to) {}
   int from;
   int to;
 };
 
 
+class InlinedFunctionInfo {

[Vyacheslav Egorov (Google), 2015/02/16 15:12:02]

Maybe we should move HSourcePosition and rename into something like
SourcePosition, OptSourcePosition, SourceLocation, etc; to here as well so that
we could use it instead of raw intptr_t value?

[Sven Panne, 2015/02/17 07:31:06]

This sounds sensible, I don't really like all those naked integral values with
tons of different interpretations. While you're there, please fix the undefined
behavior in HSourcePosition (found by -fsanitize=shift): BitFields should
*never* wrap a signed type.

+ public:
+  explicit InlinedFunctionInfo(Handle<SharedFunctionInfo> shared)
+      : shared_(shared), start_position_(shared->start_position()) {}
+
+  Handle<SharedFunctionInfo> shared() const { return shared_; }
+  int start_position() const { return start_position_; }
+
+ private:
+  Handle<SharedFunctionInfo> shared_;
+  int start_position_;
+};
+
+
 class ScriptData {
  public:
   ScriptData(const byte* data, int length);
   ~ScriptData() {
     if (owns_data_) DeleteArray(data_);
   }
 
   const byte* data() const { return data_; }
   int length() const { return length_; }
   bool rejected() const { return rejected_; }
@@ skipping 333 matching lines @@
   inline void AddNoFrameRange(int from, int to) {
     if (no_frame_ranges_) no_frame_ranges_->Add(OffsetRange(from, to));
   }
 
   List<OffsetRange>* ReleaseNoFrameRanges() {
     List<OffsetRange>* result = no_frame_ranges_;
     no_frame_ranges_ = NULL;
     return result;
   }
 
+  List<InlinedFunctionInfo>* inlined_function_infos() {
+    return inlined_function_infos_;
+  }
+  List<int>* inlining_id_to_function_id() {
+    return inlining_id_to_function_id_;
+  }
+  int TraceInlinedFunction(Handle<SharedFunctionInfo> shared, int raw_position);
+
   Handle<Foreign> object_wrapper() {
     if (object_wrapper_.is_null()) {
       object_wrapper_ =
           isolate()->factory()->NewForeign(reinterpret_cast<Address>(this));
     }
     return object_wrapper_;
   }
 
   void AbortDueToDependencyChange() {
     DCHECK(!OptimizingCompilerThread::IsOptimizerThread(isolate()));
@@ skipping 123 matching lines @@
       Handle<T> handle(*(*object));
       *object = handle;
     }
   }
 
   BailoutReason bailout_reason_;
 
   int prologue_offset_;
 
   List<OffsetRange>* no_frame_ranges_;
+  List<InlinedFunctionInfo>* inlined_function_infos_;
+  List<int>* inlining_id_to_function_id_;
 
   // A copy of shared_info()->opt_count() to avoid handle deref
   // during graph optimization.
   int opt_count_;
 
   // Number of parameters used for compilation of stubs that require arguments.
   int parameter_count_;
 
   Handle<Foreign> object_wrapper_;
 
@@ skipping 237 matching lines @@
   Zone zone_;
   size_t info_zone_start_allocation_size_;
   base::ElapsedTimer timer_;
 
   DISALLOW_COPY_AND_ASSIGN(CompilationPhase);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_COMPILER_H_