Merged: [cpu-profiler] use new source position information for deoptimization in cpu profiler

src/source-position.h

 // Copyright 2016 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_SOURCE_POSITION_H_
 #define V8_SOURCE_POSITION_H_
 
 #include <ostream>
 
 #include "src/flags.h"
@@ skipping 49 matching lines @@
     DCHECK(inlining_id <= InliningIdField::kMax - 2);
     DCHECK(inlining_id >= kNotInlined);
     value_ = InliningIdField::update(value_, inlining_id + 1);
   }
 
   static const int kNotInlined = -1;
   STATIC_ASSERT(kNoSourcePosition == -1);
 
   int64_t raw() const { return static_cast<int64_t>(value_); }
   static SourcePosition FromRaw(int64_t raw) {
-    SourcePosition position;
+    SourcePosition position = Unknown();
     DCHECK_GE(raw, 0);
     position.value_ = static_cast<uint64_t>(raw);
     return position;
   }
 
  private:
-  // SourcePosition is used in a union in CodeEventsContainer, which requires a
-  // trivial constructor.
-  SourcePosition() = default;
-
   void Print(std::ostream& out, SharedFunctionInfo* function) const;
   SourcePositionInfo Info(Handle<SharedFunctionInfo> script) const;
 
   // InliningId is in the high bits for better compression in
   // SourcePositionTable.
   typedef BitField64<int, 0, 31> ScriptOffsetField;
   typedef BitField64<int, 31, 16> InliningIdField;
   // Leaving the highest bit untouched to allow for signed conversion.
   uint64_t value_;
 };
 
 inline bool operator==(const SourcePosition& lhs, const SourcePosition& rhs) {
   return lhs.raw() == rhs.raw();
 }
 
 inline bool operator!=(const SourcePosition& lhs, const SourcePosition& rhs) {
   return !(lhs == rhs);
 }
 
 struct InliningPosition {
   // position of the inlined call
   SourcePosition position = SourcePosition::Unknown();
 
   // references position in DeoptimizationInputData::literals()
   int inlined_function_id;
 };
 
 struct SourcePositionInfo {
-  explicit SourcePositionInfo(SourcePosition pos) : position(pos) {}
+  explicit SourcePositionInfo(SourcePosition pos, Handle<SharedFunctionInfo> f)
+      : position(pos), function(f) {}
 
   SourcePosition position;
-  MaybeHandle<SharedFunctionInfo> function;
+  Handle<SharedFunctionInfo> function;
   int line = -1;
   int column = -1;
 };
 
 std::ostream& operator<<(std::ostream& out, const SourcePosition& pos);
 
 std::ostream& operator<<(std::ostream& out, const SourcePositionInfo& pos);
 std::ostream& operator<<(std::ostream& out,
                          const std::vector<SourcePositionInfo>& stack);
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_SOURCE_POSITION_H_