Skip to content

Commit ae67a70

Browse files
committed
deps: make V8 14.2 ABI-compatible with 14.1
- Remove `kGCCallbackFlagLastResort` GC callback flag Refs: v8/v8@2baf973
1 parent 485879f commit ae67a70

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

deps/v8/include/v8-callbacks.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ enum GCCallbackFlags {
184184
kGCCallbackFlagCollectAllAvailableGarbage = 1 << 4,
185185
kGCCallbackFlagCollectAllExternalMemory = 1 << 5,
186186
kGCCallbackScheduleIdleGarbageCollection = 1 << 6,
187-
kGCCallbackFlagLastResort = 1 << 7,
188187
};
189188

190189
using GCCallback = void (*)(GCType type, GCCallbackFlags flags);

deps/v8/src/heap/heap.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,8 +1361,6 @@ void Heap::CollectAllAvailableGarbage(GarbageCollectionReason gc_reason) {
13611361
if (gc_reason == GarbageCollectionReason::kLastResort ||
13621362
gc_reason == GarbageCollectionReason::kExternalMemoryPressure) {
13631363
gc_flags |= GCFlag::kLastResort;
1364-
gc_callback_flags = static_cast<GCCallbackFlags>(
1365-
gc_callback_flags | GCCallbackFlags::kGCCallbackFlagLastResort);
13661364
}
13671365

13681366
if (gc_reason == GarbageCollectionReason::kLowMemoryNotification) {

deps/v8/test/unittests/api/gc-callbacks-unittest.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,11 @@ TEST_F(GCCallbackFlagsTest, CollectAllAvailableGarbage) {
213213
[&](v8::Isolate* isolate, v8::GCType, v8::GCCallbackFlags flags) {
214214
ASSERT_TRUE(flags &
215215
GCCallbackFlags::kGCCallbackFlagCollectAllAvailableGarbage);
216-
ASSERT_FALSE(flags & GCCallbackFlags::kGCCallbackFlagLastResort);
217216
prologue_count++;
218217
},
219218
[&](v8::Isolate* isolate, v8::GCType, v8::GCCallbackFlags flags) {
220219
ASSERT_TRUE(flags &
221220
GCCallbackFlags::kGCCallbackFlagCollectAllAvailableGarbage);
222-
ASSERT_FALSE(flags & GCCallbackFlags::kGCCallbackFlagLastResort);
223221
epilogue_count++;
224222
});
225223

@@ -240,13 +238,11 @@ TEST_F(GCCallbackFlagsTest, CollectAllAvailableGarbageAndLastResort) {
240238
[&](v8::Isolate* isolate, v8::GCType, v8::GCCallbackFlags flags) {
241239
ASSERT_TRUE(flags &
242240
GCCallbackFlags::kGCCallbackFlagCollectAllAvailableGarbage);
243-
ASSERT_TRUE(flags & GCCallbackFlags::kGCCallbackFlagLastResort);
244241
prologue_count++;
245242
},
246243
[&](v8::Isolate* isolate, v8::GCType, v8::GCCallbackFlags flags) {
247244
ASSERT_TRUE(flags &
248245
GCCallbackFlags::kGCCallbackFlagCollectAllAvailableGarbage);
249-
ASSERT_TRUE(flags & GCCallbackFlags::kGCCallbackFlagLastResort);
250246
epilogue_count++;
251247
});
252248

0 commit comments

Comments
 (0)