| Index: tools/clang/blink_gc_plugin/tests/legacy_naming/traceimpl_overloaded.h
|
| diff --git a/tools/clang/blink_gc_plugin/tests/legacy_naming/traceimpl_overloaded.h b/tools/clang/blink_gc_plugin/tests/legacy_naming/traceimpl_overloaded.h
|
| index 808821df452625706d5c9b23549a9fd0b7244b1a..34185a3998810ec33e9a1b9594eb50efbd307812 100644
|
| --- a/tools/clang/blink_gc_plugin/tests/legacy_naming/traceimpl_overloaded.h
|
| +++ b/tools/clang/blink_gc_plugin/tests/legacy_naming/traceimpl_overloaded.h
|
| @@ -12,61 +12,40 @@ namespace blink {
|
| class X : public GarbageCollected<X> {
|
| public:
|
| void trace(Visitor*) {}
|
| - void trace(InlinedGlobalMarkingVisitor) {}
|
| };
|
|
|
| class InlinedBase : public GarbageCollected<InlinedBase> {
|
| public:
|
| - virtual void trace(Visitor* visitor) { traceImpl(visitor); }
|
| - virtual void trace(InlinedGlobalMarkingVisitor visitor) {
|
| - traceImpl(visitor);
|
| - }
|
| + virtual void trace(Visitor* visitor) { visitor->trace(x_base_); }
|
|
|
| private:
|
| - template <typename VisitorDispatcher>
|
| - void traceImpl(VisitorDispatcher visitor) { visitor->trace(x_base_); }
|
| -
|
| Member<X> x_base_;
|
| };
|
|
|
| class InlinedDerived : public InlinedBase {
|
| 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 {
|
| visitor->trace(x_derived_);
|
| InlinedBase::trace(visitor);
|
| }
|
|
|
| + private:
|
| Member<X> x_derived_;
|
| };
|
|
|
| class ExternBase : public GarbageCollected<ExternBase> {
|
| public:
|
| virtual void trace(Visitor*);
|
| - virtual void trace(InlinedGlobalMarkingVisitor);
|
|
|
| private:
|
| - template <typename VisitorDispatcher>
|
| - void traceImpl(VisitorDispatcher);
|
| -
|
| Member<X> x_base_;
|
| };
|
|
|
| class ExternDerived : public ExternBase {
|
| public:
|
| void trace(Visitor*) override;
|
| - void trace(InlinedGlobalMarkingVisitor) override;
|
|
|
| private:
|
| - template <typename VisitorDispatcher>
|
| - void traceImpl(VisitorDispatcher);
|
| -
|
| Member<X> x_derived_;
|
| };
|
|
|
|
|