CpuProfiler: replace raw position with SourcePosition for DeoptReason

src/profile-generator.h

 // Copyright 2011 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_PROFILE_GENERATOR_H_
 #define V8_PROFILE_GENERATOR_H_
 
 #include <map>
 #include "include/v8-profiler.h"
 #include "src/allocation.h"
+#include "src/compiler.h"
 #include "src/hashmap.h"
 #include "src/strings-storage.h"
 
 namespace v8 {
 namespace internal {
 
 struct OffsetRange;
 
 // Provides a mapping from the offsets within generated code to
 // the source line.
@@ skipping 36 matching lines @@
   const JITLineInfoTable* line_info() const { return line_info_; }
   int script_id() const { return script_id_; }
   void set_script_id(int script_id) { script_id_ = script_id; }
   int position() const { return position_; }
   void set_position(int position) { position_ = position; }
   void set_bailout_reason(const char* bailout_reason) {
     bailout_reason_ = bailout_reason;
   }
   const char* bailout_reason() const { return bailout_reason_; }
 
-  void set_deopt_info(const char* deopt_reason, int location) {
-    DCHECK(!deopt_location_);
+  void set_deopt_info(const char* deopt_reason, SourcePosition position) {
+    DCHECK(deopt_position_.IsUnknown());
     deopt_reason_ = deopt_reason;
-    deopt_location_ = location;
+    deopt_position_ = position;
   }
   const char* deopt_reason() const { return deopt_reason_; }
-  int deopt_location() const { return deopt_location_; }
-  bool has_deopt_info() const { return deopt_location_; }
+  SourcePosition deopt_position() const { return deopt_position_; }
+  bool has_deopt_info() const { return !deopt_position_.IsUnknown(); }
   void clear_deopt_info() {
     deopt_reason_ = kNoDeoptReason;
-    deopt_location_ = 0;
+    deopt_position_ = SourcePosition::Unknown();
   }
 
   void FillFunctionInfo(SharedFunctionInfo* shared);
 
   static inline bool is_js_function_tag(Logger::LogEventsAndTags tag);
 
   List<OffsetRange>* no_frame_ranges() const { return no_frame_ranges_; }
   void set_no_frame_ranges(List<OffsetRange>* ranges) {
     no_frame_ranges_ = ranges;
   }
@@ skipping 24 matching lines @@
   const char* name_prefix_;
   const char* name_;
   const char* resource_name_;
   int line_number_;
   int column_number_;
   int script_id_;
   int position_;
   List<OffsetRange>* no_frame_ranges_;
   const char* bailout_reason_;
   const char* deopt_reason_;
-  int deopt_location_;
+  SourcePosition deopt_position_;
   JITLineInfoTable* line_info_;
   Address instruction_start_;
 
   DISALLOW_COPY_AND_ASSIGN(CodeEntry);
 };
 
 
 class ProfileTree;
 
 class ProfileNode {
  private:
   struct DeoptInfo {
-    DeoptInfo(const char* deopt_reason, int deopt_location)
-        : deopt_reason(deopt_reason), deopt_location(deopt_location) {}
+    DeoptInfo(const char* deopt_reason, SourcePosition deopt_position)
+        : deopt_reason(deopt_reason), deopt_position(deopt_position) {}
     DeoptInfo(const DeoptInfo& info)
         : deopt_reason(info.deopt_reason),
-          deopt_location(info.deopt_location) {}
+          deopt_position(info.deopt_position) {}
     const char* deopt_reason;
-    int deopt_location;
+    SourcePosition deopt_position;
   };
 
  public:
   inline ProfileNode(ProfileTree* tree, CodeEntry* entry);
 
   ProfileNode* FindChild(CodeEntry* entry);
   ProfileNode* FindOrAddChild(CodeEntry* entry);
   void IncrementSelfTicks() { ++self_ticks_; }
   void IncreaseSelfTicks(unsigned amount) { self_ticks_ += amount; }
   void IncrementLineTicks(int src_line);
@@ skipping 222 matching lines @@
   CodeEntry* gc_entry_;
   CodeEntry* unresolved_entry_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileGenerator);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_PROFILE_GENERATOR_H_