| Index: tools/clang/blink_gc_plugin/tests/trace_after_dispatch_impl_error.h
|
| diff --git a/tools/clang/blink_gc_plugin/tests/trace_after_dispatch_impl_error.h b/tools/clang/blink_gc_plugin/tests/trace_after_dispatch_impl_error.h
|
| index 29f9a8a2a440173aeae2541210d7f237e489f441..00c79867849d6d53f39b697e5d9b07dfbee35327 100644
|
| --- a/tools/clang/blink_gc_plugin/tests/trace_after_dispatch_impl_error.h
|
| +++ b/tools/clang/blink_gc_plugin/tests/trace_after_dispatch_impl_error.h
|
| @@ -23,23 +23,13 @@ class TraceAfterDispatchInlinedBase
|
| public:
|
| explicit TraceAfterDispatchInlinedBase(ClassTag tag) : tag_(tag) {}
|
|
|
| - void Trace(Visitor* visitor) { TraceImpl(visitor); }
|
| - void Trace(InlinedGlobalMarkingVisitor visitor) { TraceImpl(visitor); }
|
| + void Trace(Visitor*);
|
|
|
| - void TraceAfterDispatch(Visitor* visitor) { TraceAfterDispatchImpl(visitor); }
|
| - void TraceAfterDispatch(InlinedGlobalMarkingVisitor visitor) {
|
| - TraceAfterDispatchImpl(visitor);
|
| - }
|
| -
|
| - private:
|
| - template <typename VisitorDispatcher>
|
| - void TraceImpl(VisitorDispatcher visitor);
|
| -
|
| - template <typename VisitorDispatcher>
|
| - void TraceAfterDispatchImpl(VisitorDispatcher visitor) {
|
| + void TraceAfterDispatch(Visitor* visitor) {
|
| // No Trace call; should get a warning.
|
| }
|
|
|
| + private:
|
| ClassTag tag_;
|
| Member<X> x_base_;
|
| };
|
| @@ -48,17 +38,11 @@ class TraceAfterDispatchInlinedDerived : public TraceAfterDispatchInlinedBase {
|
| public:
|
| TraceAfterDispatchInlinedDerived() : TraceAfterDispatchInlinedBase(DERIVED) {}
|
|
|
| - void TraceAfterDispatch(Visitor* visitor) { TraceAfterDispatchImpl(visitor); }
|
| - void TraceAfterDispatch(InlinedGlobalMarkingVisitor visitor) {
|
| - TraceAfterDispatchImpl(visitor);
|
| - }
|
| -
|
| - private:
|
| - template <typename VisitorDispatcher>
|
| - void TraceAfterDispatchImpl(VisitorDispatcher visitor) {
|
| + void TraceAfterDispatch(Visitor* visitor) {
|
| // No Trace call (for member and base class).
|
| }
|
|
|
| + private:
|
| Member<X> x_derived_;
|
| };
|
|
|
| @@ -68,18 +52,10 @@ class TraceAfterDispatchExternBase
|
| explicit TraceAfterDispatchExternBase(ClassTag tag) : tag_(tag) {}
|
|
|
| void Trace(Visitor* visitor);
|
| - void Trace(InlinedGlobalMarkingVisitor visitor);
|
|
|
| void TraceAfterDispatch(Visitor* visitor);
|
| - void TraceAfterDispatch(InlinedGlobalMarkingVisitor visitor);
|
|
|
| private:
|
| - template <typename VisitorDispatcher>
|
| - void TraceImpl(VisitorDispatcher visitor);
|
| -
|
| - template <typename VisitorDispatcher>
|
| - void TraceAfterDispatchImpl(VisitorDispatcher visitor);
|
| -
|
| ClassTag tag_;
|
| Member<X> x_base_;
|
| };
|
| @@ -89,12 +65,8 @@ class TraceAfterDispatchExternDerived : public TraceAfterDispatchExternBase {
|
| TraceAfterDispatchExternDerived() : TraceAfterDispatchExternBase(DERIVED) {}
|
|
|
| void TraceAfterDispatch(Visitor* visitor);
|
| - void TraceAfterDispatch(InlinedGlobalMarkingVisitor visitor);
|
|
|
| private:
|
| - template <typename VisitorDispatcher>
|
| - void TraceAfterDispatchImpl(VisitorDispatcher visitor);
|
| -
|
| Member<X> x_derived_;
|
| };
|
|
|
|
|