| Index: tools/clang/blink_gc_plugin/tests/traceimpl_dependent_scope.h
|
| diff --git a/tools/clang/blink_gc_plugin/tests/traceimpl_dependent_scope.h b/tools/clang/blink_gc_plugin/tests/traceimpl_dependent_scope.h
|
| index 1c54627486af43dfe40cbfe58deb0f3aadb9c43b..631921b1bb6b38b972d385a7aa0437496aed58da 100644
|
| --- a/tools/clang/blink_gc_plugin/tests/traceimpl_dependent_scope.h
|
| +++ b/tools/clang/blink_gc_plugin/tests/traceimpl_dependent_scope.h
|
| @@ -17,42 +17,19 @@ class X : public GarbageCollected<X> {
|
| template <typename T>
|
| class Base : public GarbageCollected<Base<T> > {
|
| public:
|
| - virtual void Trace(Visitor* visitor) { TraceImpl(visitor); }
|
| - virtual void Trace(InlinedGlobalMarkingVisitor visitor) {
|
| - TraceImpl(visitor);
|
| - }
|
| -
|
| - private:
|
| - template <typename VisitorDispatcher>
|
| - void TraceImpl(VisitorDispatcher visitor) {}
|
| + virtual void Trace(Visitor* visitor) {}
|
| };
|
|
|
| template <typename T>
|
| class Derived : public Base<T> {
|
| public:
|
| - void Trace(Visitor* visitor) override { TraceImpl(visitor); }
|
| - void Trace(InlinedGlobalMarkingVisitor visitor) override {
|
| - TraceImpl(visitor);
|
| - }
|
| -
|
| - private:
|
| - template <typename VisitorDispatcher>
|
| - void TraceImpl(VisitorDispatcher visitor) {
|
| - Base<T>::Trace(visitor);
|
| - }
|
| + void Trace(Visitor* visitor) override { Base<T>::Trace(visitor); }
|
| };
|
|
|
| template <typename T>
|
| class DerivedMissingTrace : public Base<T> {
|
| public:
|
| - void Trace(Visitor* visitor) override { TraceImpl(visitor); }
|
| - void Trace(InlinedGlobalMarkingVisitor visitor) override {
|
| - TraceImpl(visitor);
|
| - }
|
| -
|
| - private:
|
| - template <typename VisitorDispatcher>
|
| - void TraceImpl(VisitorDispatcher visitor) {
|
| + void Trace(Visitor* visitor) override {
|
| // Missing Base<T>::Trace(visitor).
|
| }
|
| };
|
|
|