CpuProfiler: move InlinedFunctionInfo class from HGraphBuilder to CompilationInfo.

src/compiler.cc

 // 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.
 
 #include "src/v8.h"
 
 #include "src/compiler.h"
 
 #include "src/ast-numbering.h"
 #include "src/bootstrapper.h"
@@ skipping 129 matching lines @@
   extension_ = NULL;
   cached_data_ = NULL;
   compile_options_ = ScriptCompiler::kNoCompileOptions;
   zone_ = zone;
   deferred_handles_ = NULL;
   code_stub_ = NULL;
   prologue_offset_ = Code::kPrologueOffsetNotSet;
   opt_count_ = shared_info().is_null() ? 0 : shared_info()->opt_count();
   no_frame_ranges_ = isolate->cpu_profiler()->is_profiling()
                    ? new List<OffsetRange>(2) : NULL;
+  if (FLAG_hydrogen_track_positions) {
+    inlined_function_infos_ = new List<InlinedFunctionInfo>(5);
+    inlining_id_to_function_id_ = new List<int>(5);
+  } else {
+    inlined_function_infos_ = NULL;
+    inlining_id_to_function_id_ = NULL;
+  }
+
   for (int i = 0; i < DependentCode::kGroupCount; i++) {
     dependencies_[i] = NULL;
   }
   if (mode == STUB) {
     mode_ = STUB;
     return;
   }
   mode_ = mode;
   if (!script_.is_null() && script_->type()->value() == Script::TYPE_NATIVE) {
     MarkAsNative();
@@ skipping 26 matching lines @@
   }
 }
 
 
 CompilationInfo::~CompilationInfo() {
   if (GetFlag(kDisableFutureOptimization)) {
     shared_info()->DisableOptimization(bailout_reason());
   }
   delete deferred_handles_;
   delete no_frame_ranges_;
+  if (inlined_function_infos_) delete inlined_function_infos_;

[Vyacheslav Egorov (Google), 2015/02/16 13:38:50]

delete NULL works just fine - so no need for if.

[loislo, 2015/02/16 14:48:32]

Done.

+  if (inlining_id_to_function_id_) delete inlining_id_to_function_id_;
   if (ast_value_factory_owned_) delete ast_value_factory_;
 #ifdef DEBUG
   // Check that no dependent maps have been added or added dependent maps have
   // been rolled back or committed.
   for (int i = 0; i < DependentCode::kGroupCount; i++) {
     DCHECK(!dependencies_[i]);
   }
 #endif  // DEBUG
 }
 
@@ skipping 100 matching lines @@
         function()->feedback_vector_spec());
   }
 }
 
 
 bool CompilationInfo::is_simple_parameter_list() {
   return scope_->is_simple_parameter_list();
 }
 
 
+int CompilationInfo::GetInlinedFunctionId(Handle<SharedFunctionInfo> shared) {
+  DCHECK(inlined_function_infos_);
+  DCHECK(inlining_id_to_function_id_);
+  int id = 0;
+  for (; id < inlined_function_infos_->length(); id++) {
+    if (inlined_function_infos_->at(id).shared().is_identical_to(shared)) {
+      break;
+    }
+  }
+  if (id == inlined_function_infos_->length()) {
+    inlined_function_infos_->Add(InlinedFunctionInfo(shared));
+
+    if (!shared->script()->IsUndefined()) {

[Vyacheslav Egorov (Google), 2015/02/16 13:38:50]

Given that you want to reuse this function for profiler - it makes sense to
guard this branch proactively with FLAG_... to avoid spitting output when flag
is disabled.

[loislo, 2015/02/16 14:48:32]

Yep. I supposed to do that in the next patch.

+      Handle<Script> script(Script::cast(shared->script()));
+      if (!script->source()->IsUndefined()) {
+        CodeTracer::Scope tracing_scopex(isolate()->GetCodeTracer());

[Vyacheslav Egorov (Google), 2015/02/16 13:38:50]

can it be called just tracing_scope here?

[loislo, 2015/02/16 14:48:32]

Done.

+        OFStream os(tracing_scopex.file());
+        os << "--- FUNCTION SOURCE (" << shared->DebugName()->ToCString().get()
+           << ") id{" << optimization_id() << "," << id << "} ---\n";
+        {
+          DisallowHeapAllocation no_allocation;
+          int start = shared->start_position();
+          int len = shared->end_position() - start + 1;
+          String::SubStringRange source(String::cast(script->source()), start,
+                                        len);
+          for (const auto& c : source) {
+            os << AsReversiblyEscapedUC16(c);
+          }
+        }
+
+        os << "\n--- END ---\n";
+      }
+    }
+  }
+  return id;
+}
+
+
 class HOptimizedGraphBuilderWithPositions: public HOptimizedGraphBuilder {
  public:
   explicit HOptimizedGraphBuilderWithPositions(CompilationInfo* info)
       : HOptimizedGraphBuilder(info) {
   }
 
 #define DEF_VISIT(type)                               \
   void Visit##type(type* node) OVERRIDE {             \
     if (node->position() != RelocInfo::kNoPosition) { \
       SetSourcePosition(node->position());            \
@@ skipping 1195 matching lines @@
 }
 
 
 #if DEBUG
 void CompilationInfo::PrintAstForTesting() {
   PrintF("--- Source from AST ---\n%s\n",
          PrettyPrinter(isolate(), zone()).PrintProgram(function()));
 }
 #endif
 } }  // namespace v8::internal