|
@@ -63,10 +63,10 @@ index 27fbc04bc880f2ea68dc7a126b8091a3b5ab4025..42d9649c5250c06a4d39ba0306cbdea0
|
|
|
} // namespace internal
|
|
|
} // namespace v8
|
|
|
diff --git a/src/objects/objects.cc b/src/objects/objects.cc
|
|
|
-index d83783a5560a355684a866e1aca2cc081835919b..f8622e1311838df9548bc1839cd40d17af02a7d2 100644
|
|
|
+index 71c4b37adcc03901a289d4f01554bfb61356942d..0faa5d7f0ef0a80de99feaf6b0a3f338a216bd7a 100644
|
|
|
--- a/src/objects/objects.cc
|
|
|
+++ b/src/objects/objects.cc
|
|
|
-@@ -4361,7 +4361,6 @@ namespace {
|
|
|
+@@ -4316,7 +4316,6 @@ namespace {
|
|
|
template <typename Char>
|
|
|
bool GetPositionInfoSlowImpl(base::Vector<Char> source, int position,
|
|
|
Script::PositionInfo* info) {
|
|
@@ -74,7 +74,7 @@ index d83783a5560a355684a866e1aca2cc081835919b..f8622e1311838df9548bc1839cd40d17
|
|
|
if (position < 0) {
|
|
|
position = 0;
|
|
|
}
|
|
|
-@@ -4408,11 +4407,25 @@ int GetLength(const String::LineEndsVector& vector) {
|
|
|
+@@ -4363,11 +4362,25 @@ int GetLength(const String::LineEndsVector& vector) {
|
|
|
}
|
|
|
|
|
|
int GetLength(const Tagged<FixedArray>& array) { return array->length(); }
|
|
@@ -103,7 +103,7 @@ index d83783a5560a355684a866e1aca2cc081835919b..f8622e1311838df9548bc1839cd40d17
|
|
|
const int ends_len = GetLength(ends);
|
|
|
if (ends_len == 0) return false;
|
|
|
|
|
|
-@@ -4451,31 +4464,6 @@ bool GetLineEndsContainerPositionInfo(const LineEndsContainer& ends,
|
|
|
+@@ -4406,31 +4419,6 @@ bool GetLineEndsContainerPositionInfo(const LineEndsContainer& ends,
|
|
|
info->column = position - info->line_start;
|
|
|
}
|
|
|
|
|
@@ -135,7 +135,7 @@ index d83783a5560a355684a866e1aca2cc081835919b..f8622e1311838df9548bc1839cd40d17
|
|
|
// Line end is position of the linebreak character.
|
|
|
info->line_end = GetLineEnd(ends, info->line);
|
|
|
if (info->line_end > 0) {
|
|
|
-@@ -4544,23 +4532,6 @@ bool Script::GetPositionInfoWithLineEnds(
|
|
|
+@@ -4499,23 +4487,6 @@ bool Script::GetPositionInfoWithLineEnds(
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -160,11 +160,11 @@ index d83783a5560a355684a866e1aca2cc081835919b..f8622e1311838df9548bc1839cd40d17
|
|
|
PositionInfo info;
|
|
|
GetPositionInfo(script, code_pos, &info);
|
|
|
diff --git a/src/objects/script.h b/src/objects/script.h
|
|
|
-index bfa0dc0e9b7625636c21620563ef0a19fcf20900..8b89639dd78a80cfae570a4746f391b1359d65a7 100644
|
|
|
+index 1f9778861dd3454c3ac86d9e2589b3a58da23ecc..e860c0a2bfeb625ffe51932c7f32567ab1323d8f 100644
|
|
|
--- a/src/objects/script.h
|
|
|
+++ b/src/objects/script.h
|
|
|
-@@ -205,9 +205,6 @@ class Script : public TorqueGeneratedScript<Script, Struct> {
|
|
|
- static bool GetPositionInfo(Handle<Script> script, int position,
|
|
|
+@@ -208,9 +208,6 @@ class Script : public TorqueGeneratedScript<Script, Struct> {
|
|
|
+ static bool GetPositionInfo(DirectHandle<Script> script, int position,
|
|
|
PositionInfo* info,
|
|
|
OffsetFlag offset_flag = OffsetFlag::kWithOffset);
|
|
|
- static bool GetLineColumnWithLineEnds(
|
|
@@ -317,7 +317,7 @@ index d04bb9bf73b4b5725c99dade26510f4964ec0d4b..bb59c92a780160c4168349bfc5d523df
|
|
|
AddressToTraceMap address_to_trace_;
|
|
|
};
|
|
|
diff --git a/src/profiler/heap-snapshot-generator.cc b/src/profiler/heap-snapshot-generator.cc
|
|
|
-index 1b7170bd84c29d9e6228e92a8e3ad46d50967a15..417a487bd6767b15bb177394f4273af21bd64883 100644
|
|
|
+index 9f92ebe9dc1d2412551be30a5299882883510316..c24078ed95e885b5ff307d9bf82e8fac117e5000 100644
|
|
|
--- a/src/profiler/heap-snapshot-generator.cc
|
|
|
+++ b/src/profiler/heap-snapshot-generator.cc
|
|
|
@@ -2999,6 +2999,7 @@ bool HeapSnapshotGenerator::GenerateSnapshot() {
|
|
@@ -379,10 +379,10 @@ index 1b7170bd84c29d9e6228e92a8e3ad46d50967a15..417a487bd6767b15bb177394f4273af2
|
|
|
buffer[buffer_pos++] = '\0';
|
|
|
writer_->AddString(buffer.begin());
|
|
|
diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc
|
|
|
-index 4885cab74f95378a9ff884d58a8c089624985a8f..f1e869f28e00c0449e85b00f3f4626e0941e4c43 100644
|
|
|
+index f151a848b0eb76b79c8f34296400d7311541e603..d3e703c678180628ff6e2ecf528dd2dcc82a804f 100644
|
|
|
--- a/test/cctest/test-heap-profiler.cc
|
|
|
+++ b/test/cctest/test-heap-profiler.cc
|
|
|
-@@ -2841,6 +2841,8 @@ TEST(ArrayGrowLeftTrim) {
|
|
|
+@@ -2869,6 +2869,8 @@ TEST(ArrayGrowLeftTrim) {
|
|
|
AllocationTracker* tracker =
|
|
|
reinterpret_cast<i::HeapProfiler*>(heap_profiler)->allocation_tracker();
|
|
|
CHECK(tracker);
|
|
@@ -391,7 +391,7 @@ index 4885cab74f95378a9ff884d58a8c089624985a8f..f1e869f28e00c0449e85b00f3f4626e0
|
|
|
// Print for better diagnostics in case of failure.
|
|
|
tracker->trace_tree()->Print(tracker);
|
|
|
|
|
|
-@@ -2863,6 +2865,8 @@ TEST(TrackHeapAllocationsWithInlining) {
|
|
|
+@@ -2891,6 +2893,8 @@ TEST(TrackHeapAllocationsWithInlining) {
|
|
|
AllocationTracker* tracker =
|
|
|
reinterpret_cast<i::HeapProfiler*>(heap_profiler)->allocation_tracker();
|
|
|
CHECK(tracker);
|
|
@@ -400,7 +400,7 @@ index 4885cab74f95378a9ff884d58a8c089624985a8f..f1e869f28e00c0449e85b00f3f4626e0
|
|
|
// Print for better diagnostics in case of failure.
|
|
|
tracker->trace_tree()->Print(tracker);
|
|
|
|
|
|
-@@ -2895,6 +2899,8 @@ TEST(TrackHeapAllocationsWithoutInlining) {
|
|
|
+@@ -2923,6 +2927,8 @@ TEST(TrackHeapAllocationsWithoutInlining) {
|
|
|
AllocationTracker* tracker =
|
|
|
reinterpret_cast<i::HeapProfiler*>(heap_profiler)->allocation_tracker();
|
|
|
CHECK(tracker);
|
|
@@ -409,7 +409,7 @@ index 4885cab74f95378a9ff884d58a8c089624985a8f..f1e869f28e00c0449e85b00f3f4626e0
|
|
|
// Print for better diagnostics in case of failure.
|
|
|
tracker->trace_tree()->Print(tracker);
|
|
|
|
|
|
-@@ -2943,6 +2949,8 @@ TEST(TrackBumpPointerAllocations) {
|
|
|
+@@ -2971,6 +2977,8 @@ TEST(TrackBumpPointerAllocations) {
|
|
|
AllocationTracker* tracker =
|
|
|
reinterpret_cast<i::HeapProfiler*>(heap_profiler)->allocation_tracker();
|
|
|
CHECK(tracker);
|
|
@@ -418,7 +418,7 @@ index 4885cab74f95378a9ff884d58a8c089624985a8f..f1e869f28e00c0449e85b00f3f4626e0
|
|
|
// Print for better diagnostics in case of failure.
|
|
|
tracker->trace_tree()->Print(tracker);
|
|
|
|
|
|
-@@ -2967,6 +2975,8 @@ TEST(TrackBumpPointerAllocations) {
|
|
|
+@@ -2995,6 +3003,8 @@ TEST(TrackBumpPointerAllocations) {
|
|
|
AllocationTracker* tracker =
|
|
|
reinterpret_cast<i::HeapProfiler*>(heap_profiler)->allocation_tracker();
|
|
|
CHECK(tracker);
|
|
@@ -427,7 +427,7 @@ index 4885cab74f95378a9ff884d58a8c089624985a8f..f1e869f28e00c0449e85b00f3f4626e0
|
|
|
// Print for better diagnostics in case of failure.
|
|
|
tracker->trace_tree()->Print(tracker);
|
|
|
|
|
|
-@@ -2994,6 +3004,8 @@ TEST(TrackV8ApiAllocation) {
|
|
|
+@@ -3022,6 +3032,8 @@ TEST(TrackV8ApiAllocation) {
|
|
|
AllocationTracker* tracker =
|
|
|
reinterpret_cast<i::HeapProfiler*>(heap_profiler)->allocation_tracker();
|
|
|
CHECK(tracker);
|