Improve handling of debug name in 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/compiler.h"
 
 #include <algorithm>
 
 #include "src/ast-numbering.h"
 #include "src/bootstrapper.h"
@@ skipping 138 matching lines @@
 
 CompilationInfo::CompilationInfo(CodeStub* stub, Isolate* isolate, Zone* zone)
     : CompilationInfo(nullptr, stub, CodeStub::MajorName(stub->MajorKey()),
                       STUB, isolate, zone) {}
 
 CompilationInfo::CompilationInfo(const char* debug_name, Isolate* isolate,
                                  Zone* zone)
     : CompilationInfo(nullptr, nullptr, debug_name, STUB, isolate, zone) {}
 
 CompilationInfo::CompilationInfo(ParseInfo* parse_info, CodeStub* code_stub,
-                                 const char* code_stub_debug_name, Mode mode,
+                                 const char* debug_name, Mode mode,
                                  Isolate* isolate, Zone* zone)
     : parse_info_(parse_info),
       isolate_(isolate),
       flags_(0),
       code_stub_(code_stub),
       mode_(mode),
       osr_ast_id_(BailoutId::None()),
       zone_(zone),
       deferred_handles_(nullptr),
       dependencies_(isolate, zone),
       bailout_reason_(kNoReason),
       prologue_offset_(Code::kPrologueOffsetNotSet),
       no_frame_ranges_(isolate->cpu_profiler()->is_profiling()
                            ? new List<OffsetRange>(2)
                            : nullptr),
       track_positions_(FLAG_hydrogen_track_positions ||
                        isolate->cpu_profiler()->is_profiling()),
       opt_count_(has_shared_info() ? shared_info()->opt_count() : 0),
       parameter_count_(0),
       optimization_id_(-1),
       osr_expr_stack_height_(0),
       function_type_(nullptr),
-      code_stub_debug_name_(code_stub_debug_name) {
+      debug_name_(debug_name) {
   // Parameter count is number of stack parameters.
   if (code_stub_ != NULL) {
     CodeStubDescriptor descriptor(code_stub_);
     parameter_count_ = descriptor.GetStackParameterCount();
     if (descriptor.function_mode() == NOT_JS_FUNCTION_STUB_MODE) {
       parameter_count_--;
     }
   }
 }
 
 
 CompilationInfo::~CompilationInfo() {
   DisableFutureOptimization();
   delete deferred_handles_;
   delete no_frame_ranges_;
 #ifdef DEBUG
   // Check that no dependent maps have been added or added dependent maps have
   // been rolled back or committed.
   DCHECK(dependencies()->IsEmpty());
 #endif  // DEBUG
 }
 
 
 void CompilationInfo::SetStub(CodeStub* code_stub) {
   SetMode(STUB);
   code_stub_ = code_stub;
-  code_stub_debug_name_ = CodeStub::MajorName(code_stub->MajorKey());
+  debug_name_ = CodeStub::MajorName(code_stub->MajorKey());
 }
 
 
 int CompilationInfo::num_parameters() const {
   return has_scope() ? scope()->num_parameters() : parameter_count_;
 }
 
 
 int CompilationInfo::num_parameters_including_this() const {
   return num_parameters() + (is_this_defined() ? 1 : 0);
@@ skipping 84 matching lines @@
 
 
 void CompilationInfo::LogDeoptCallPosition(int pc_offset, int inlining_id) {
   if (!track_positions_ || IsStub()) return;
   DCHECK_LT(static_cast<size_t>(inlining_id), inlined_function_infos_.size());
   inlined_function_infos_.at(inlining_id).deopt_pc_offsets.push_back(pc_offset);
 }
 
 
 base::SmartArrayPointer<char> CompilationInfo::GetDebugName() const {
-  if (IsStub()) {
-    size_t len = strlen(code_stub_debug_name_) + 1;
-    base::SmartArrayPointer<char> name(new char[len]);
-    memcpy(name.get(), code_stub_debug_name_, len);
-    return name;
-  } else {
+  if (parse_info()) {
     AllowHandleDereference allow_deref;
-    return literal()->debug_name()->ToCString();
+    return parse_info()->literal()->debug_name()->ToCString();
   }
+  const char* str = debug_name_ ? debug_name_ : "unknown";
+  size_t len = strlen(str) + 1;
+  base::SmartArrayPointer<char> name(new char[len]);
+  memcpy(name.get(), str, len);
+  return name;
 }
 
 
 bool CompilationInfo::MustReplaceUndefinedReceiverWithGlobalProxy() {
   return is_sloppy(language_mode()) && !is_native() &&
          scope()->has_this_declaration() && scope()->receiver()->is_used();
 }
 
 
 class HOptimizedGraphBuilderWithPositions: public HOptimizedGraphBuilder {
@@ skipping 1419 matching lines @@
 }
 
 #if DEBUG
 void CompilationInfo::PrintAstForTesting() {
   PrintF("--- Source from AST ---\n%s\n",
          PrettyPrinter(isolate(), zone()).PrintProgram(literal()));
 }
 #endif
 }  // namespace internal
 }  // namespace v8