| Index: Source/platform/heap/HeapTest.cpp
|
| diff --git a/Source/platform/heap/HeapTest.cpp b/Source/platform/heap/HeapTest.cpp
|
| index bef5d11eeaa3d5b300463ca3269ef65647462634..ac4186a6ab422e5622b7b1b936ccaece26b52dd9 100644
|
| --- a/Source/platform/heap/HeapTest.cpp
|
| +++ b/Source/platform/heap/HeapTest.cpp
|
| @@ -673,6 +673,8 @@ protected:
|
| }
|
| };
|
|
|
| +WILL_NOT_BE_EAGERLY_TRACED(Bar);
|
| +
|
| unsigned Bar::s_live = 0;
|
|
|
| class Baz : public GarbageCollected<Baz> {
|
| @@ -5307,7 +5309,7 @@ TEST(HeapTest, TraceTypesEagerly)
|
| COMPILE_ASSERT(TraceEagerlyTrait<TraceTypeEagerly1>::value, ShouldBeTrue);
|
| COMPILE_ASSERT(TraceEagerlyTrait<Member<TraceTypeEagerly1>>::value, ShouldBeTrue);
|
| COMPILE_ASSERT(TraceEagerlyTrait<WeakMember<TraceTypeEagerly1>>::value, ShouldBeTrue);
|
| - COMPILE_ASSERT(ENABLE_EAGER_TRACING_BY_DEFAULT || !TraceEagerlyTrait<RawPtr<TraceTypeEagerly1>>::value, ShouldBeTrue);
|
| + COMPILE_ASSERT(TraceEagerlyTrait<RawPtr<TraceTypeEagerly1>>::value == MARKER_EAGER_TRACING, ShouldBeTrue);
|
| COMPILE_ASSERT(TraceEagerlyTrait<HeapVector<Member<TraceTypeEagerly1>>>::value, ShouldBeTrue);
|
| COMPILE_ASSERT(TraceEagerlyTrait<HeapVector<WeakMember<TraceTypeEagerly1>>>::value, ShouldBeTrue);
|
| COMPILE_ASSERT(TraceEagerlyTrait<HeapHashSet<Member<TraceTypeEagerly1>>>::value, ShouldBeTrue);
|
| @@ -5325,8 +5327,8 @@ TEST(HeapTest, TraceTypesEagerly)
|
| COMPILE_ASSERT(TraceEagerlyTrait<TraceTypeEagerly5>::value, ShouldBeTrue);
|
| COMPILE_ASSERT(TraceEagerlyTrait<Member<TraceTypeEagerly5>>::value, ShouldBeTrue);
|
|
|
| - COMPILE_ASSERT(ENABLE_EAGER_TRACING_BY_DEFAULT || !TraceEagerlyTrait<TraceTypeEagerly6>::value, ShouldBeTrue);
|
| - COMPILE_ASSERT(ENABLE_EAGER_TRACING_BY_DEFAULT || !TraceEagerlyTrait<TraceTypeEagerly7>::value, ShouldBeTrue);
|
| + COMPILE_ASSERT(TraceEagerlyTrait<TraceTypeEagerly6>::value == MARKER_EAGER_TRACING, ShouldBeTrue);
|
| + COMPILE_ASSERT(TraceEagerlyTrait<TraceTypeEagerly7>::value == MARKER_EAGER_TRACING, ShouldBeTrue);
|
|
|
| COMPILE_ASSERT(!TraceEagerlyTrait<TraceTypeNonEagerly1>::value, ShouldBeTrue);
|
| }
|
|
|