ab2b18e1be
This CL removes the GetTraceDescriptor virtual call from garbage collected mixins and replaces it with querying the object start bitmap. The CL also removes the mixin macros which are now no longer needed. Bug: chromium:1056170 Change-Id: I27ed299f93025d09a3bb3f0d17b14bed3c200565 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2287508 Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Reviewed-by: Anton Bikineev <bikineev@chromium.org> Commit-Queue: Omer Katz <omerkatz@chromium.org> Cr-Commit-Position: refs/heads/master@{#68787}
141 lines
4.8 KiB
C++
141 lines
4.8 KiB
C++
// Copyright 2020 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.
|
|
|
|
#include "include/cppgc/garbage-collected.h"
|
|
|
|
#include "include/cppgc/allocation.h"
|
|
#include "include/cppgc/type-traits.h"
|
|
#include "src/heap/cppgc/heap-object-header.h"
|
|
#include "src/heap/cppgc/heap.h"
|
|
#include "test/unittests/heap/cppgc/tests.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
|
|
namespace cppgc {
|
|
namespace internal {
|
|
|
|
namespace {
|
|
|
|
class GCed : public GarbageCollected<GCed> {
|
|
public:
|
|
void Trace(Visitor*) const {}
|
|
};
|
|
class NotGCed {};
|
|
class Mixin : public GarbageCollectedMixin {};
|
|
class GCedWithMixin : public GarbageCollected<GCedWithMixin>, public Mixin {};
|
|
class OtherMixin : public GarbageCollectedMixin {};
|
|
class MergedMixins : public Mixin, public OtherMixin {
|
|
public:
|
|
void Trace(cppgc::Visitor* visitor) const override {
|
|
Mixin::Trace(visitor);
|
|
OtherMixin::Trace(visitor);
|
|
}
|
|
};
|
|
class GCWithMergedMixins : public GCed, public MergedMixins {
|
|
public:
|
|
void Trace(cppgc::Visitor* visitor) const override {
|
|
MergedMixins::Trace(visitor);
|
|
}
|
|
};
|
|
|
|
class GarbageCollectedTestWithHeap
|
|
: public testing::TestSupportingAllocationOnly {};
|
|
|
|
} // namespace
|
|
|
|
TEST(GarbageCollectedTest, GarbageCollectedTrait) {
|
|
STATIC_ASSERT(!IsGarbageCollectedType<int>::value);
|
|
STATIC_ASSERT(!IsGarbageCollectedType<NotGCed>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedType<GCed>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedType<Mixin>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedType<GCedWithMixin>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedType<MergedMixins>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedType<GCWithMergedMixins>::value);
|
|
}
|
|
|
|
TEST(GarbageCollectedTest, GarbageCollectedMixinTrait) {
|
|
STATIC_ASSERT(!IsGarbageCollectedMixinType<int>::value);
|
|
STATIC_ASSERT(!IsGarbageCollectedMixinType<GCed>::value);
|
|
STATIC_ASSERT(!IsGarbageCollectedMixinType<NotGCed>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedMixinType<Mixin>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedMixinType<GCedWithMixin>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedMixinType<MergedMixins>::value);
|
|
STATIC_ASSERT(IsGarbageCollectedMixinType<GCWithMergedMixins>::value);
|
|
}
|
|
|
|
TEST_F(GarbageCollectedTestWithHeap, GetObjectStartReturnsCurrentAddress) {
|
|
GCed* gced = MakeGarbageCollected<GCed>(GetAllocationHandle());
|
|
GCedWithMixin* gced_with_mixin =
|
|
MakeGarbageCollected<GCedWithMixin>(GetAllocationHandle());
|
|
const void* base_object_payload = TraceTrait<Mixin>::GetTraceDescriptor(
|
|
static_cast<Mixin*>(gced_with_mixin))
|
|
.base_object_payload;
|
|
EXPECT_EQ(gced_with_mixin, base_object_payload);
|
|
EXPECT_NE(gced, base_object_payload);
|
|
}
|
|
|
|
namespace {
|
|
|
|
class GCedWithPostConstructionCallback final : public GCed {
|
|
public:
|
|
static size_t cb_callcount;
|
|
GCedWithPostConstructionCallback() { cb_callcount = 0; }
|
|
};
|
|
size_t GCedWithPostConstructionCallback::cb_callcount;
|
|
|
|
class MixinWithPostConstructionCallback {
|
|
public:
|
|
static size_t cb_callcount;
|
|
MixinWithPostConstructionCallback() { cb_callcount = 0; }
|
|
using MarkerForMixinWithPostConstructionCallback = int;
|
|
};
|
|
size_t MixinWithPostConstructionCallback::cb_callcount;
|
|
|
|
class GCedWithMixinWithPostConstructionCallback final
|
|
: public GCed,
|
|
public MixinWithPostConstructionCallback {};
|
|
|
|
} // namespace
|
|
} // namespace internal
|
|
|
|
template <>
|
|
struct PostConstructionCallbackTrait<
|
|
internal::GCedWithPostConstructionCallback> {
|
|
static void Call(internal::GCedWithPostConstructionCallback* object) {
|
|
EXPECT_FALSE(
|
|
internal::HeapObjectHeader::FromPayload(object).IsInConstruction());
|
|
internal::GCedWithPostConstructionCallback::cb_callcount++;
|
|
}
|
|
};
|
|
|
|
template <typename T>
|
|
struct PostConstructionCallbackTrait<
|
|
T,
|
|
internal::void_t<typename T::MarkerForMixinWithPostConstructionCallback>> {
|
|
// The parameter could just be T*.
|
|
static void Call(
|
|
internal::GCedWithMixinWithPostConstructionCallback* object) {
|
|
EXPECT_FALSE(
|
|
internal::HeapObjectHeader::FromPayload(object).IsInConstruction());
|
|
internal::GCedWithMixinWithPostConstructionCallback::cb_callcount++;
|
|
}
|
|
};
|
|
|
|
namespace internal {
|
|
|
|
TEST_F(GarbageCollectedTestWithHeap, PostConstructionCallback) {
|
|
EXPECT_EQ(0u, GCedWithPostConstructionCallback::cb_callcount);
|
|
MakeGarbageCollected<GCedWithPostConstructionCallback>(GetAllocationHandle());
|
|
EXPECT_EQ(1u, GCedWithPostConstructionCallback::cb_callcount);
|
|
}
|
|
|
|
TEST_F(GarbageCollectedTestWithHeap, PostConstructionCallbackForMixin) {
|
|
EXPECT_EQ(0u, MixinWithPostConstructionCallback::cb_callcount);
|
|
MakeGarbageCollected<GCedWithMixinWithPostConstructionCallback>(
|
|
GetAllocationHandle());
|
|
EXPECT_EQ(1u, MixinWithPostConstructionCallback::cb_callcount);
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace cppgc
|