-
Notifications
You must be signed in to change notification settings - Fork 0
/
libchromiumcontent_patches.diff
644 lines (637 loc) · 26.9 KB
/
libchromiumcontent_patches.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
diff --git a/patches/v8/007-backport_f19b889.patch b/patches/v8/007-backport_f19b889.patch
index da815fb..920fae9 100644
--- a/patches/v8/007-backport_f19b889.patch
+++ b/patches/v8/007-backport_f19b889.patch
@@ -113,93 +113,3 @@ index 3effb39f7c..a7666dfd42 100644
void resetContextGroup(int contextGroupId) override;
void idleStarted() override;
void idleFinished() override;
-diff --git a/test/inspector/inspector-test.cc b/test/inspector/inspector-test.cc
-index 930d6c9477..767168b297 100644
---- a/test/inspector/inspector-test.cc
-+++ b/test/inspector/inspector-test.cc
-@@ -642,6 +642,9 @@ class InspectorExtension : public IsolateData::SetupGlobalTask {
- inspector->Set(ToV8String(isolate, "fireContextDestroyed"),
- v8::FunctionTemplate::New(
- isolate, &InspectorExtension::FireContextDestroyed));
-+ inspector->Set(
-+ ToV8String(isolate, "freeContext"),
-+ v8::FunctionTemplate::New(isolate, &InspectorExtension::FreeContext));
- inspector->Set(ToV8String(isolate, "addInspectedObject"),
- v8::FunctionTemplate::New(
- isolate, &InspectorExtension::AddInspectedObject));
-@@ -683,6 +686,12 @@ class InspectorExtension : public IsolateData::SetupGlobalTask {
- data->FireContextDestroyed(context);
- }
-
-+ static void FreeContext(const v8::FunctionCallbackInfo<v8::Value>& args) {
-+ v8::Local<v8::Context> context = args.GetIsolate()->GetCurrentContext();
-+ IsolateData* data = IsolateData::FromContext(context);
-+ data->FreeContext(context);
-+ }
-+
- static void AddInspectedObject(
- const v8::FunctionCallbackInfo<v8::Value>& args) {
- if (args.Length() != 2 || !args[0]->IsInt32()) {
-diff --git a/test/inspector/isolate-data.cc b/test/inspector/isolate-data.cc
-index 74c367a5e9..bd97a927e8 100644
---- a/test/inspector/isolate-data.cc
-+++ b/test/inspector/isolate-data.cc
-@@ -303,6 +303,13 @@ void IsolateData::FireContextDestroyed(v8::Local<v8::Context> context) {
- inspector_->contextDestroyed(context);
- }
-
-+void IsolateData::FreeContext(v8::Local<v8::Context> context) {
-+ int context_group_id = GetContextGroupId(context);
-+ auto it = contexts_.find(context_group_id);
-+ if (it == contexts_.end()) return;
-+ contexts_.erase(it);
-+}
-+
- std::vector<int> IsolateData::GetSessionIds(int context_group_id) {
- std::vector<int> result;
- for (auto& it : sessions_) {
-diff --git a/test/inspector/isolate-data.h b/test/inspector/isolate-data.h
-index a94316ff9b..c96a8d1bbd 100644
---- a/test/inspector/isolate-data.h
-+++ b/test/inspector/isolate-data.h
-@@ -68,6 +68,7 @@ class IsolateData : public v8_inspector::V8InspectorClient {
- void DumpAsyncTaskStacksStateForTest();
- void FireContextCreated(v8::Local<v8::Context> context, int context_group_id);
- void FireContextDestroyed(v8::Local<v8::Context> context);
-+ void FreeContext(v8::Local<v8::Context> context);
-
- private:
- struct VectorCompare {
-diff --git a/test/inspector/runtime/context-destroyed-on-context-collected-expected.txt b/test/inspector/runtime/context-destroyed-on-context-collected-expected.txt
-new file mode 100644
-index 0000000000..9a5e1708c1
---- /dev/null
-+++ b/test/inspector/runtime/context-destroyed-on-context-collected-expected.txt
-@@ -0,0 +1,7 @@
-+Tests that contextDesrtoyed nofitication is fired when context is collected.
-+{
-+ method : Runtime.executionContextDestroyed
-+ params : {
-+ executionContextId : <executionContextId>
-+ }
-+}
-diff --git a/test/inspector/runtime/context-destroyed-on-context-collected.js b/test/inspector/runtime/context-destroyed-on-context-collected.js
-new file mode 100644
-index 0000000000..9f715937c6
---- /dev/null
-+++ b/test/inspector/runtime/context-destroyed-on-context-collected.js
-@@ -0,0 +1,14 @@
-+// Copyright 2017 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.
-+
-+let {session, contextGroup, Protocol} =
-+ InspectorTest.start('Tests that contextDesrtoyed nofitication is fired when context is collected.');
-+
-+(async function test() {
-+ await Protocol.Runtime.enable();
-+ Protocol.Runtime.onExecutionContextDestroyed(InspectorTest.logMessage);
-+ contextGroup.addScript('inspector.freeContext()');
-+ await Protocol.HeapProfiler.collectGarbage();
-+ InspectorTest.completeTest();
-+})();
diff --git a/patches/v8/009-backport_bca8409.patch b/patches/v8/009-backport_bca8409.patch
index 0b806d1..bb754f4 100644
--- a/patches/v8/009-backport_bca8409.patch
+++ b/patches/v8/009-backport_bca8409.patch
@@ -136,25 +136,3 @@ index 9ea365e405..8460fa7841 100644
base::Semaphore pending_sweeper_tasks_semaphore_;
base::Mutex mutex_;
SweptList swept_list_[kAllocationSpaces];
-diff --git a/test/unittests/cancelable-tasks-unittest.cc b/test/unittests/cancelable-tasks-unittest.cc
-index eb5dd91589..d0462877f5 100644
---- a/test/unittests/cancelable-tasks-unittest.cc
-+++ b/test/unittests/cancelable-tasks-unittest.cc
-@@ -180,7 +180,7 @@ TEST(CancelableTask, RemoveBeforeCancelAndWait) {
- ResultType result1 = 0;
- TestTask* task1 = new TestTask(&manager, &result1, TestTask::kCheckNotRun);
- ThreadedRunner runner1(task1);
-- uint32_t id = task1->id();
-+ CancelableTaskManager::Id id = task1->id();
- EXPECT_EQ(id, 1u);
- EXPECT_TRUE(manager.TryAbort(id));
- runner1.Start();
-@@ -195,7 +195,7 @@ TEST(CancelableTask, RemoveAfterCancelAndWait) {
- ResultType result1 = 0;
- TestTask* task1 = new TestTask(&manager, &result1);
- ThreadedRunner runner1(task1);
-- uint32_t id = task1->id();
-+ CancelableTaskManager::Id id = task1->id();
- EXPECT_EQ(id, 1u);
- runner1.Start();
- runner1.Join();
diff --git a/patches/v8/010-backport_f9c4b7a.patch b/patches/v8/010-backport_f9c4b7a.patch
index 9f0c9d0..efc97d7 100644
--- a/patches/v8/010-backport_f9c4b7a.patch
+++ b/patches/v8/010-backport_f9c4b7a.patch
@@ -194,15 +194,3 @@ index 5b1e26e1d0..48f5b30bd2 100644
DumpAndResetStats();
-diff --git a/test/cctest/heap/test-spaces.cc b/test/cctest/heap/test-spaces.cc
-index 26b2fdd193..b99913ab80 100644
---- a/test/cctest/heap/test-spaces.cc
-+++ b/test/cctest/heap/test-spaces.cc
-@@ -370,6 +370,7 @@ TEST(NewSpace) {
- }
-
- new_space.TearDown();
-+ memory_allocator->unmapper()->WaitUntilCompleted();
- memory_allocator->TearDown();
- delete memory_allocator;
- }
diff --git a/patches/v8/013-revert_abi_breaking_changes_in_6_1.patch b/patches/v8/013-revert_abi_breaking_changes_in_6_1.patch
index 7153632..654c702 100644
--- a/patches/v8/013-revert_abi_breaking_changes_in_6_1.patch
+++ b/patches/v8/013-revert_abi_breaking_changes_in_6_1.patch
@@ -516,25 +516,6 @@ index 48f5b30bd2..8e517982ac 100644
time_millis_at_init_ = heap_.MonotonicallyIncreasingTimeInMs();
-diff --git a/src/trap-handler/handler-inside.cc b/src/trap-handler/handler-inside.cc
-index a51bd9427f..4a748b8175 100644
---- a/src/trap-handler/handler-inside.cc
-+++ b/src/trap-handler/handler-inside.cc
-@@ -36,13 +36,13 @@ namespace trap_handler {
-
- namespace {
-
-+#if V8_TRAP_HANDLER_SUPPORTED
- bool IsKernelGeneratedSignal(siginfo_t* info) {
- return info->si_code > 0 && info->si_code != SI_USER &&
- info->si_code != SI_QUEUE && info->si_code != SI_TIMER &&
- info->si_code != SI_ASYNCIO && info->si_code != SI_MESGQ;
- }
-
--#if V8_TRAP_HANDLER_SUPPORTED
- class SigUnmaskStack {
- public:
- explicit SigUnmaskStack(sigset_t sigs) {
diff --git a/src/trap-handler/trap-handler.h b/src/trap-handler/trap-handler.h
index ed9459918b..73a147f0cb 100644
--- a/src/trap-handler/trap-handler.h
@@ -552,167 +533,3 @@ index ed9459918b..73a147f0cb 100644
struct ProtectedInstructionData {
// The offset of this instruction from the start of its code object.
-diff --git a/test/cctest/heap/test-heap.cc b/test/cctest/heap/test-heap.cc
-index 6781d3de6a..d9608292e8 100644
---- a/test/cctest/heap/test-heap.cc
-+++ b/test/cctest/heap/test-heap.cc
-@@ -4806,7 +4806,7 @@ HEAP_TEST(Regress538257) {
- FLAG_manual_evacuation_candidates_selection = true;
- v8::Isolate::CreateParams create_params;
- // Set heap limits.
-- create_params.constraints.set_max_semi_space_size_in_kb(1024);
-+ create_params.constraints.set_max_semi_space_size(1);
- create_params.constraints.set_max_old_space_size(6);
- create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
- v8::Isolate* isolate = v8::Isolate::New(create_params);
-diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
-index 2d64279bf8..aa4cba5a60 100644
---- a/test/cctest/test-api.cc
-+++ b/test/cctest/test-api.cc
-@@ -3453,16 +3453,10 @@ class ScopedArrayBufferContents {
- public:
- explicit ScopedArrayBufferContents(const v8::ArrayBuffer::Contents& contents)
- : contents_(contents) {}
-- ~ScopedArrayBufferContents() { free(contents_.AllocationBase()); }
-+ ~ScopedArrayBufferContents() { free(contents_.Data()); }
- void* Data() const { return contents_.Data(); }
- size_t ByteLength() const { return contents_.ByteLength(); }
-
-- void* AllocationBase() const { return contents_.AllocationBase(); }
-- size_t AllocationLength() const { return contents_.AllocationLength(); }
-- v8::ArrayBuffer::Allocator::AllocationMode AllocationMode() const {
-- return contents_.AllocationMode();
-- }
--
- private:
- const v8::ArrayBuffer::Contents contents_;
- };
-@@ -3738,43 +3732,15 @@ THREADED_TEST(ArrayBuffer_NeuteringScript) {
- CheckDataViewIsNeutered(dv);
- }
-
--THREADED_TEST(ArrayBuffer_AllocationInformation) {
-- LocalContext env;
-- v8::Isolate* isolate = env->GetIsolate();
-- v8::HandleScope handle_scope(isolate);
--
-- const size_t ab_size = 1024;
-- Local<v8::ArrayBuffer> ab = v8::ArrayBuffer::New(isolate, ab_size);
-- ScopedArrayBufferContents contents(ab->Externalize());
--
-- // Array buffers should have normal allocation mode.
-- CHECK(contents.AllocationMode() ==
-- v8::ArrayBuffer::Allocator::AllocationMode::kNormal);
-- // The allocation must contain the buffer (normally they will be equal, but
-- // this is not required by the contract).
-- CHECK_NOT_NULL(contents.AllocationBase());
-- const uintptr_t alloc =
-- reinterpret_cast<uintptr_t>(contents.AllocationBase());
-- const uintptr_t data = reinterpret_cast<uintptr_t>(contents.Data());
-- CHECK_LE(alloc, data);
-- CHECK_LE(data + contents.ByteLength(), alloc + contents.AllocationLength());
--}
--
- class ScopedSharedArrayBufferContents {
- public:
- explicit ScopedSharedArrayBufferContents(
- const v8::SharedArrayBuffer::Contents& contents)
- : contents_(contents) {}
-- ~ScopedSharedArrayBufferContents() { free(contents_.AllocationBase()); }
-+ ~ScopedSharedArrayBufferContents() { free(contents_.Data()); }
- void* Data() const { return contents_.Data(); }
- size_t ByteLength() const { return contents_.ByteLength(); }
-
-- void* AllocationBase() const { return contents_.AllocationBase(); }
-- size_t AllocationLength() const { return contents_.AllocationLength(); }
-- v8::ArrayBuffer::Allocator::AllocationMode AllocationMode() const {
-- return contents_.AllocationMode();
-- }
--
- private:
- const v8::SharedArrayBuffer::Contents contents_;
- };
-@@ -20361,7 +20327,7 @@ class InitDefaultIsolateThread : public v8::base::Thread {
- create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
- switch (testCase_) {
- case SetResourceConstraints: {
-- create_params.constraints.set_max_semi_space_size_in_kb(1024);
-+ create_params.constraints.set_max_semi_space_size(1);
- create_params.constraints.set_max_old_space_size(6);
- break;
- }
-@@ -26057,29 +26023,6 @@ TEST(FutexInterruption) {
- timeout_thread.Join();
- }
-
--THREADED_TEST(SharedArrayBuffer_AllocationInformation) {
-- i::FLAG_harmony_sharedarraybuffer = true;
-- LocalContext env;
-- v8::Isolate* isolate = env->GetIsolate();
-- v8::HandleScope handle_scope(isolate);
--
-- const size_t ab_size = 1024;
-- Local<v8::SharedArrayBuffer> ab =
-- v8::SharedArrayBuffer::New(isolate, ab_size);
-- ScopedSharedArrayBufferContents contents(ab->Externalize());
--
-- // Array buffers should have normal allocation mode.
-- CHECK(contents.AllocationMode() ==
-- v8::ArrayBuffer::Allocator::AllocationMode::kNormal);
-- // The allocation must contain the buffer (normally they will be equal, but
-- // this is not required by the contract).
-- CHECK_NOT_NULL(contents.AllocationBase());
-- const uintptr_t alloc =
-- reinterpret_cast<uintptr_t>(contents.AllocationBase());
-- const uintptr_t data = reinterpret_cast<uintptr_t>(contents.Data());
-- CHECK_LE(alloc, data);
-- CHECK_LE(data + contents.ByteLength(), alloc + contents.AllocationLength());
--}
-
- static int nb_uncaught_exception_callback_calls = 0;
-
-diff --git a/test/cctest/test-strings.cc b/test/cctest/test-strings.cc
-index 73e9c58596..d98a4819b5 100644
---- a/test/cctest/test-strings.cc
-+++ b/test/cctest/test-strings.cc
-@@ -1301,7 +1301,7 @@ TEST(SliceFromSlice) {
- UNINITIALIZED_TEST(OneByteArrayJoin) {
- v8::Isolate::CreateParams create_params;
- // Set heap limits.
-- create_params.constraints.set_max_semi_space_size_in_kb(1024);
-+ create_params.constraints.set_max_semi_space_size(1);
- create_params.constraints.set_max_old_space_size(7);
- create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
- v8::Isolate* isolate = v8::Isolate::New(create_params);
-diff --git a/test/unittests/heap/heap-unittest.cc b/test/unittests/heap/heap-unittest.cc
-index 6262eff210..8dab181ca7 100644
---- a/test/unittests/heap/heap-unittest.cc
-+++ b/test/unittests/heap/heap-unittest.cc
-@@ -63,14 +63,19 @@ TEST(Heap, MaxHeapGrowingFactor) {
- }
-
- TEST(Heap, SemiSpaceSize) {
-- const size_t KB = static_cast<size_t>(i::KB);
-- const size_t MB = static_cast<size_t>(i::MB);
-- const size_t pm = i::Heap::kPointerMultiplier;
-- ASSERT_EQ(1u * pm * MB / 2, i::Heap::ComputeMaxSemiSpaceSize(0u) * KB);
-- ASSERT_EQ(1u * pm * MB / 2, i::Heap::ComputeMaxSemiSpaceSize(512u * MB) * KB);
-- ASSERT_EQ(3u * pm * MB, i::Heap::ComputeMaxSemiSpaceSize(1024u * MB) * KB);
-- ASSERT_EQ(8u * pm * MB, i::Heap::ComputeMaxSemiSpaceSize(2024u * MB) * KB);
-- ASSERT_EQ(8u * pm * MB, i::Heap::ComputeMaxSemiSpaceSize(4095u * MB) * KB);
-+ uint64_t configurations[][2] = {
-+ {0, 1 * i::Heap::kPointerMultiplier},
-+ {512 * i::MB, 1 * i::Heap::kPointerMultiplier},
-+ {1 * i::GB, 3 * i::Heap::kPointerMultiplier},
-+ {2 * static_cast<uint64_t>(i::GB), i::Heap::kMaxSemiSpaceSize},
-+ {4 * static_cast<uint64_t>(i::GB), i::Heap::kMaxSemiSpaceSize},
-+ {8 * static_cast<uint64_t>(i::GB), i::Heap::kMaxSemiSpaceSize}};
-+
-+ for (auto configuration : configurations) {
-+ ASSERT_EQ(configuration[1],
-+ static_cast<uint64_t>(
-+ i::Heap::ComputeMaxSemiSpaceSize(configuration[0])));
-+ }
- }
-
- TEST(Heap, OldGenerationSize) {
diff --git a/patches/v8/015-backport_9b21865822243.patch b/patches/v8/015-backport_9b21865822243.patch
index 98164ca..e6769e0 100644
--- a/patches/v8/015-backport_9b21865822243.patch
+++ b/patches/v8/015-backport_9b21865822243.patch
@@ -331,81 +331,4 @@ index 44ef96b064..2ea58d886b 100644
+ std::vector<GCCallbackTuple> gc_prologue_callbacks_;
GetExternallyAllocatedMemoryInBytesCallback external_memory_callback_;
-
-diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
-index aa4cba5a60..06ce7c565e 100644
---- a/test/cctest/test-api.cc
-+++ b/test/cctest/test-api.cc
-@@ -19592,6 +19592,19 @@ void EpilogueCallbackSecond(v8::Isolate* isolate,
- ++epilogue_call_count_second;
- }
-
-+void PrologueCallbackNew(v8::Isolate* isolate, v8::GCType,
-+ v8::GCCallbackFlags flags, void* data) {
-+ CHECK_EQ(flags, v8::kNoGCCallbackFlags);
-+ CHECK_EQ(gc_callbacks_isolate, isolate);
-+ ++*static_cast<int*>(data);
-+}
-+
-+void EpilogueCallbackNew(v8::Isolate* isolate, v8::GCType,
-+ v8::GCCallbackFlags flags, void* data) {
-+ CHECK_EQ(flags, v8::kNoGCCallbackFlags);
-+ CHECK_EQ(gc_callbacks_isolate, isolate);
-+ ++*static_cast<int*>(data);
-+}
-
- void PrologueCallbackAlloc(v8::Isolate* isolate,
- v8::GCType,
-@@ -19666,6 +19679,52 @@ TEST(GCCallbacksOld) {
- CHECK_EQ(2, epilogue_call_count_second);
- }
-
-+TEST(GCCallbacksWithData) {
-+ LocalContext context;
-+
-+ gc_callbacks_isolate = context->GetIsolate();
-+ int prologue1 = 0;
-+ int epilogue1 = 0;
-+ int prologue2 = 0;
-+ int epilogue2 = 0;
-+
-+ context->GetIsolate()->AddGCPrologueCallback(PrologueCallbackNew, &prologue1);
-+ context->GetIsolate()->AddGCEpilogueCallback(EpilogueCallbackNew, &epilogue1);
-+ CHECK_EQ(0, prologue1);
-+ CHECK_EQ(0, epilogue1);
-+ CHECK_EQ(0, prologue2);
-+ CHECK_EQ(0, epilogue2);
-+ CcTest::CollectAllGarbage();
-+ CHECK_EQ(1, prologue1);
-+ CHECK_EQ(1, epilogue1);
-+ CHECK_EQ(0, prologue2);
-+ CHECK_EQ(0, epilogue2);
-+ context->GetIsolate()->AddGCPrologueCallback(PrologueCallbackNew, &prologue2);
-+ context->GetIsolate()->AddGCEpilogueCallback(EpilogueCallbackNew, &epilogue2);
-+ CcTest::CollectAllGarbage();
-+ CHECK_EQ(2, prologue1);
-+ CHECK_EQ(2, epilogue1);
-+ CHECK_EQ(1, prologue2);
-+ CHECK_EQ(1, epilogue2);
-+ context->GetIsolate()->RemoveGCPrologueCallback(PrologueCallbackNew,
-+ &prologue1);
-+ context->GetIsolate()->RemoveGCEpilogueCallback(EpilogueCallbackNew,
-+ &epilogue1);
-+ CcTest::CollectAllGarbage();
-+ CHECK_EQ(2, prologue1);
-+ CHECK_EQ(2, epilogue1);
-+ CHECK_EQ(2, prologue2);
-+ CHECK_EQ(2, epilogue2);
-+ context->GetIsolate()->RemoveGCPrologueCallback(PrologueCallbackNew,
-+ &prologue2);
-+ context->GetIsolate()->RemoveGCEpilogueCallback(EpilogueCallbackNew,
-+ &epilogue2);
-+ CcTest::CollectAllGarbage();
-+ CHECK_EQ(2, prologue1);
-+ CHECK_EQ(2, epilogue1);
-+ CHECK_EQ(2, prologue2);
-+ CHECK_EQ(2, epilogue2);
-+}
-
- TEST(GCCallbacks) {
- LocalContext context;
+
diff --git a/patches/v8/017-backport_163d360.patch b/patches/v8/017-backport_163d360.patch
index 5906deb..94c3e40 100644
--- a/patches/v8/017-backport_163d360.patch
+++ b/patches/v8/017-backport_163d360.patch
@@ -142,61 +142,3 @@ index f275a4d518..798ef89ec1 100644
chunk->ResetProgressBar();
MarkingState::Internal(chunk).SetLiveBytes(0);
}
-diff --git a/test/cctest/heap/test-heap.cc b/test/cctest/heap/test-heap.cc
-index d9608292e8..a2273d2d8c 100644
---- a/test/cctest/heap/test-heap.cc
-+++ b/test/cctest/heap/test-heap.cc
-@@ -6237,6 +6237,53 @@ HEAP_TEST(Regress5831) {
- CHECK(chunk->NeverEvacuate());
- }
-
-+TEST(Regress6800) {
-+ CcTest::InitializeVM();
-+ Isolate* isolate = CcTest::i_isolate();
-+ HandleScope handle_scope(isolate);
-+
-+ const int kRootLength = 1000;
-+ Handle<FixedArray> root =
-+ isolate->factory()->NewFixedArray(kRootLength, TENURED);
-+ {
-+ HandleScope inner_scope(isolate);
-+ Handle<FixedArray> new_space_array = isolate->factory()->NewFixedArray(1);
-+ for (int i = 0; i < kRootLength; i++) {
-+ root->set(i, *new_space_array);
-+ }
-+ for (int i = 0; i < kRootLength; i++) {
-+ root->set(i, CcTest::heap()->undefined_value());
-+ }
-+ }
-+ CcTest::CollectGarbage(NEW_SPACE);
-+ CHECK_EQ(0, RememberedSet<OLD_TO_NEW>::NumberOfPreFreedEmptyBuckets(
-+ MemoryChunk::FromAddress(root->address())));
-+}
-+
-+TEST(Regress6800LargeObject) {
-+ CcTest::InitializeVM();
-+ Isolate* isolate = CcTest::i_isolate();
-+ HandleScope handle_scope(isolate);
-+
-+ const int kRootLength = i::kMaxRegularHeapObjectSize / kPointerSize;
-+ Handle<FixedArray> root =
-+ isolate->factory()->NewFixedArray(kRootLength, TENURED);
-+ CcTest::heap()->lo_space()->Contains(*root);
-+ {
-+ HandleScope inner_scope(isolate);
-+ Handle<FixedArray> new_space_array = isolate->factory()->NewFixedArray(1);
-+ for (int i = 0; i < kRootLength; i++) {
-+ root->set(i, *new_space_array);
-+ }
-+ for (int i = 0; i < kRootLength; i++) {
-+ root->set(i, CcTest::heap()->undefined_value());
-+ }
-+ }
-+ CcTest::CollectGarbage(OLD_SPACE);
-+ CHECK_EQ(0, RememberedSet<OLD_TO_NEW>::NumberOfPreFreedEmptyBuckets(
-+ MemoryChunk::FromAddress(root->address())));
-+}
-+
- HEAP_TEST(RegressMissingWriteBarrierInAllocate) {
- if (!FLAG_incremental_marking) return;
- FLAG_black_allocation = true;
diff --git a/patches/v8/023-backport_b1cd96e.patch b/patches/v8/023-backport_b1cd96e.patch
index d40453d..140f8e5 100644
--- a/patches/v8/023-backport_b1cd96e.patch
+++ b/patches/v8/023-backport_b1cd96e.patch
@@ -24,121 +24,3 @@ index 03bf57cf7d..7356cb48d2 100644
if (!maxAsyncCallStackDepth) allAsyncTasksCanceled();
}
-diff --git a/test/inspector/debugger/max-async-call-stack-depth-changed-expected.txt b/test/inspector/debugger/max-async-call-stack-depth-changed-expected.txt
-new file mode 100644
-index 0000000000..0f94b592e0
---- /dev/null
-+++ b/test/inspector/debugger/max-async-call-stack-depth-changed-expected.txt
-@@ -0,0 +1,5 @@
-+Tests for max async call stack depth changed.
-+maxAsyncCallStackDepthChanged: 8
-+maxAsyncCallStackDepthChanged: 0
-+maxAsyncCallStackDepthChanged: 8
-+maxAsyncCallStackDepthChanged: 0
-diff --git a/test/inspector/debugger/max-async-call-stack-depth-changed.js b/test/inspector/debugger/max-async-call-stack-depth-changed.js
-new file mode 100644
-index 0000000000..2d58539810
---- /dev/null
-+++ b/test/inspector/debugger/max-async-call-stack-depth-changed.js
-@@ -0,0 +1,16 @@
-+// Copyright 2017 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.
-+
-+let {session, contextGroup, Protocol} =
-+ InspectorTest.start('Tests for max async call stack depth changed.');
-+
-+(async function test(){
-+ utils.setLogMaxAsyncCallStackDepthChanged(true);
-+ await Protocol.Debugger.enable();
-+ await Protocol.Debugger.setAsyncCallStackDepth({maxDepth: 8});
-+ await Protocol.Debugger.setAsyncCallStackDepth({maxDepth: 0});
-+ await Protocol.Debugger.setAsyncCallStackDepth({maxDepth: 8});
-+ await Protocol.Debugger.disable();
-+ InspectorTest.completeTest();
-+})();
-diff --git a/test/inspector/inspector-test.cc b/test/inspector/inspector-test.cc
-index 767168b297..4c133cee1f 100644
---- a/test/inspector/inspector-test.cc
-+++ b/test/inspector/inspector-test.cc
-@@ -299,6 +299,10 @@ class UtilsExtension : public IsolateData::SetupGlobalTask {
- utils->Set(ToV8String(isolate, "setLogConsoleApiMessageCalls"),
- v8::FunctionTemplate::New(
- isolate, &UtilsExtension::SetLogConsoleApiMessageCalls));
-+ utils->Set(
-+ ToV8String(isolate, "setLogMaxAsyncCallStackDepthChanged"),
-+ v8::FunctionTemplate::New(
-+ isolate, &UtilsExtension::SetLogMaxAsyncCallStackDepthChanged));
- utils->Set(ToV8String(isolate, "createContextGroup"),
- v8::FunctionTemplate::New(isolate,
- &UtilsExtension::CreateContextGroup));
-@@ -485,6 +489,17 @@ class UtilsExtension : public IsolateData::SetupGlobalTask {
- args[0].As<v8::Boolean>()->Value());
- }
-
-+ static void SetLogMaxAsyncCallStackDepthChanged(
-+ const v8::FunctionCallbackInfo<v8::Value>& args) {
-+ if (args.Length() != 1 || !args[0]->IsBoolean()) {
-+ fprintf(stderr,
-+ "Internal error: setLogMaxAsyncCallStackDepthChanged(bool).");
-+ Exit();
-+ }
-+ backend_runner_->data()->SetLogMaxAsyncCallStackDepthChanged(
-+ args[0].As<v8::Boolean>()->Value());
-+ }
-+
- static void CreateContextGroup(
- const v8::FunctionCallbackInfo<v8::Value>& args) {
- if (args.Length() != 0) {
-diff --git a/test/inspector/isolate-data.cc b/test/inspector/isolate-data.cc
-index bd97a927e8..2e9a64f66d 100644
---- a/test/inspector/isolate-data.cc
-+++ b/test/inspector/isolate-data.cc
-@@ -355,6 +355,10 @@ void IsolateData::SetLogConsoleApiMessageCalls(bool log) {
- log_console_api_message_calls_ = log;
- }
-
-+void IsolateData::SetLogMaxAsyncCallStackDepthChanged(bool log) {
-+ log_max_async_call_stack_depth_changed_ = log;
-+}
-+
- v8::MaybeLocal<v8::Value> IsolateData::memoryInfo(v8::Isolate* isolate,
- v8::Local<v8::Context>) {
- if (memory_info_.IsEmpty()) return v8::MaybeLocal<v8::Value>();
-@@ -381,3 +385,8 @@ void IsolateData::consoleAPIMessage(int contextGroupId,
- Print(isolate_, stack->toString()->string());
- fprintf(stdout, "\n");
- }
-+
-+void IsolateData::maxAsyncCallStackDepthChanged(int depth) {
-+ if (!log_max_async_call_stack_depth_changed_) return;
-+ fprintf(stdout, "maxAsyncCallStackDepthChanged: %d\n", depth);
-+}
-diff --git a/test/inspector/isolate-data.h b/test/inspector/isolate-data.h
-index c96a8d1bbd..af2bf0ef1e 100644
---- a/test/inspector/isolate-data.h
-+++ b/test/inspector/isolate-data.h
-@@ -64,6 +64,7 @@ class IsolateData : public v8_inspector::V8InspectorClient {
- void SetCurrentTimeMS(double time);
- void SetMemoryInfo(v8::Local<v8::Value> memory_info);
- void SetLogConsoleApiMessageCalls(bool log);
-+ void SetLogMaxAsyncCallStackDepthChanged(bool log);
- void SetMaxAsyncTaskStacksForTest(int limit);
- void DumpAsyncTaskStacksStateForTest();
- void FireContextCreated(v8::Local<v8::Context> context, int context_group_id);
-@@ -105,6 +106,7 @@ class IsolateData : public v8_inspector::V8InspectorClient {
- const v8_inspector::StringView& url,
- unsigned lineNumber, unsigned columnNumber,
- v8_inspector::V8StackTrace*) override;
-+ void maxAsyncCallStackDepthChanged(int depth) override;
-
- TaskRunner* task_runner_;
- SetupGlobalTasks setup_global_tasks_;
-@@ -122,6 +124,7 @@ class IsolateData : public v8_inspector::V8InspectorClient {
- bool current_time_set_ = false;
- double current_time_ = 0.0;
- bool log_console_api_message_calls_ = false;
-+ bool log_max_async_call_stack_depth_changed_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(IsolateData);
- };
diff --git a/patches/v8/025-cherry_pick_cc55747.patch b/patches/v8/025-cherry_pick_cc55747.patch
deleted file mode 100644
index b8c7003..0000000
--- a/patches/v8/025-cherry_pick_cc55747.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/message/testcfg.py b/test/message/testcfg.py
-index 0576458af2..1bbb2b16d8 100644
---- a/test/message/testcfg.py
-+++ b/test/message/testcfg.py
-@@ -107,7 +107,7 @@ class MessageTestSuite(testsuite.TestSuite):
- expected_lines, actual_lines, fillvalue=''):
- pattern = re.escape(expected.rstrip() % env)
- pattern = pattern.replace("\\*", ".*")
-- pattern = pattern.replace("\\{NUMBER\\}", "\d(?:\.\d*)?")
-+ pattern = pattern.replace("\\{NUMBER\\}", "\d+(?:\.\d*)?")
- pattern = "^%s$" % pattern
- if not re.match(pattern, actual):
- return True