blink_gc_plugin: Change RefPtr to scoped_refptr

Blink moved from WTF::RefPtr to base::scoped_refptr long time ago, but
the poor GC compiler plugin was forgotten...

Bug: 763844
Change-Id: Ie61bfcf7fe4ff3c159d573282e09af7c5174bce2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2130786Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Anton Bikineev <bikineev@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755079}

tools/clang/blink_gc_plugin/Config.h

@@ -59,9 +59,7 @@ class Config {
            name == "CrossThreadWeakPersistent" ;
   }
 
-  static bool IsRefPtr(llvm::StringRef name) {
-    return name == "RefPtr";
-  }
+  static bool IsRefPtr(llvm::StringRef name) { return name == "scoped_refptr"; }
 
   static bool IsUniquePtr(llvm::StringRef name) {
     return name == "unique_ptr";

tools/clang/blink_gc_plugin/DiagnosticsReporter.cpp

@@ -47,7 +47,7 @@ const char kRawPtrToGCManagedClassNote[] =
     "[blink-gc] Raw pointer field %0 to a GC managed class declared here:";
 
 const char kRefPtrToGCManagedClassNote[] =
-    "[blink-gc] RefPtr field %0 to a GC managed class declared here:";
+    "[blink-gc] scoped_refptr field %0 to a GC managed class declared here:";
 
 const char kReferencePtrToGCManagedClassNote[] =
     "[blink-gc] Reference pointer field %0 to a GC managed class"

tools/clang/blink_gc_plugin/tests/cycle_ptrs.h

@@ -32,7 +32,7 @@ class B : public GarbageCollected<B> {
 
  private:
   Member<A> m_a;
-  RefPtr<C> m_c;
+  scoped_refptr<C> m_c;
 };
 
 class C : public RefCounted<C> {

tools/clang/blink_gc_plugin/tests/cycle_sub.h

@@ -23,7 +23,7 @@ class B : public A {
 public:
     virtual void Trace(Visitor*);
 private:
-    RefPtr<C> m_c;
+    scoped_refptr<C> m_c;
 };
 
 class C : public RefCounted<C> {

tools/clang/blink_gc_plugin/tests/cycle_super.h

@@ -19,7 +19,7 @@ class A : public GarbageCollected<A> {
   virtual void Trace(Visitor*);
 
  private:
-  RefPtr<D> m_d;
+  scoped_refptr<D> m_d;
 };
 
 class B : public A {

tools/clang/blink_gc_plugin/tests/cycle_super_neg.h

@@ -36,7 +36,7 @@ class D : public A {
 public:
     virtual void Trace(Visitor*);
 private:
-    RefPtr<C> m_c;
+    scoped_refptr<C> m_c;
 };
 
 }

tools/clang/blink_gc_plugin/tests/destructor_access_finalized_field.h

@@ -35,7 +35,7 @@ class HeapObject : public GarbageCollected<HeapObject> {
   void bar(HeapObject*) {}
 
  private:
-  RefPtr<Other> m_ref;
+  scoped_refptr<Other> m_ref;
   Member<HeapObject> m_obj;
   Vector<Member<HeapObject>> m_objs;
   PartOther m_part;

tools/clang/blink_gc_plugin/tests/fields_illegal_tracing.h

@@ -34,7 +34,7 @@ class PartObject {
 public:
     void Trace(Visitor*);
 private:
-    RefPtr<HeapObject> m_obj2;
+    scoped_refptr<HeapObject> m_obj2;
     bar::unique_ptr<HeapObject> m_obj3;
     std::unique_ptr<HeapObject> m_obj4;
     Vector<int>::iterator m_iterator1;
@@ -48,7 +48,7 @@ class HeapObject : public GarbageCollected<HeapObject> {
 
  private:
   PartObject m_part;
-  RefPtr<HeapObject> m_obj2;
+  scoped_refptr<HeapObject> m_obj2;
   bar::unique_ptr<HeapObject> m_obj3;
   std::unique_ptr<HeapObject> m_obj4;
   HeapHashMap<int, Member<HeapObject>>::reverse_iterator m_iterator3;

tools/clang/blink_gc_plugin/tests/fields_illegal_tracing.txt

@@ -2,8 +2,8 @@ In file included from fields_illegal_tracing.cpp:5:
 ./fields_illegal_tracing.h:32:1: warning: [blink-gc] Class 'PartObject' contains invalid fields.
 class PartObject {
 ^
-./fields_illegal_tracing.h:37:5: note: [blink-gc] RefPtr field 'm_obj2' to a GC managed class declared here:
-    RefPtr<HeapObject> m_obj2;
+./fields_illegal_tracing.h:37:5: note: [blink-gc] scoped_refptr field 'm_obj2' to a GC managed class declared here:
+    scoped_refptr<HeapObject> m_obj2;
     ^
 ./fields_illegal_tracing.h:39:5: note: [blink-gc] std::unique_ptr field 'm_obj4' to a GC managed class declared here:
     std::unique_ptr<HeapObject> m_obj4;
@@ -17,8 +17,8 @@ class PartObject {
 ./fields_illegal_tracing.h:45:1: warning: [blink-gc] Class 'HeapObject' contains invalid fields.
 class HeapObject : public GarbageCollected<HeapObject> {
 ^
-./fields_illegal_tracing.h:51:3: note: [blink-gc] RefPtr field 'm_obj2' to a GC managed class declared here:
-  RefPtr<HeapObject> m_obj2;
+./fields_illegal_tracing.h:51:3: note: [blink-gc] scoped_refptr field 'm_obj2' to a GC managed class declared here:
+  scoped_refptr<HeapObject> m_obj2;
   ^
 ./fields_illegal_tracing.h:53:3: note: [blink-gc] std::unique_ptr field 'm_obj4' to a GC managed class declared here:
   std::unique_ptr<HeapObject> m_obj4;
@@ -36,7 +36,7 @@ fields_illegal_tracing.cpp:9:1: warning: [blink-gc] Class 'PartObject' has untra
 void PartObject::Trace(Visitor* visitor) {
 ^
 ./fields_illegal_tracing.h:37:5: note: [blink-gc] Untraceable field 'm_obj2' declared here:
-    RefPtr<HeapObject> m_obj2;
+    scoped_refptr<HeapObject> m_obj2;
     ^
 ./fields_illegal_tracing.h:39:5: note: [blink-gc] Untraceable field 'm_obj4' declared here:
     std::unique_ptr<HeapObject> m_obj4;
@@ -45,7 +45,7 @@ fields_illegal_tracing.cpp:15:1: warning: [blink-gc] Class 'HeapObject' has untr
 void HeapObject::Trace(Visitor* visitor) {
 ^
 ./fields_illegal_tracing.h:51:3: note: [blink-gc] Untraceable field 'm_obj2' declared here:
-  RefPtr<HeapObject> m_obj2;
+  scoped_refptr<HeapObject> m_obj2;
   ^
 ./fields_illegal_tracing.h:53:3: note: [blink-gc] Untraceable field 'm_obj4' declared here:
   std::unique_ptr<HeapObject> m_obj4;

tools/clang/blink_gc_plugin/tests/heap/stubs.h

@@ -25,9 +25,9 @@ public:
     T* operator->() { return 0; }
 };
 
-template<typename T> class RefPtr {
+template<typename T> class scoped_refptr {
 public:
-    ~RefPtr() { }
+    ~scoped_refptr() { }
     operator T*() const { return 0; }
     T* operator->() { return 0; }
 };

tools/clang/blink_gc_plugin/tests/ref_ptr_to_gc_managed_class.h

@@ -14,7 +14,7 @@ class HeapObject;
 class PartObject {
     DISALLOW_NEW();
 private:
-    RefPtr<HeapObject> m_obj;
+    scoped_refptr<HeapObject> m_obj;
 };
 
 class HeapObject : public GarbageCollected<HeapObject> {
@@ -23,7 +23,7 @@ class HeapObject : public GarbageCollected<HeapObject> {
 
  private:
   PartObject m_part;
-  Vector<RefPtr<HeapObject>> m_objs;
+  Vector<scoped_refptr<HeapObject>> m_objs;
 };
 }
 

tools/clang/blink_gc_plugin/tests/ref_ptr_to_gc_managed_class.txt

@@ -2,13 +2,13 @@ In file included from ref_ptr_to_gc_managed_class.cpp:5:
 ./ref_ptr_to_gc_managed_class.h:14:1: warning: [blink-gc] Class 'PartObject' contains invalid fields.
 class PartObject {
 ^
-./ref_ptr_to_gc_managed_class.h:17:5: note: [blink-gc] RefPtr field 'm_obj' to a GC managed class declared here:
-    RefPtr<HeapObject> m_obj;
+./ref_ptr_to_gc_managed_class.h:17:5: note: [blink-gc] scoped_refptr field 'm_obj' to a GC managed class declared here:
+    scoped_refptr<HeapObject> m_obj;
     ^
 ./ref_ptr_to_gc_managed_class.h:20:1: warning: [blink-gc] Class 'HeapObject' contains invalid fields.
 class HeapObject : public GarbageCollected<HeapObject> {
 ^
-./ref_ptr_to_gc_managed_class.h:26:3: note: [blink-gc] RefPtr field 'm_objs' to a GC managed class declared here:
-  Vector<RefPtr<HeapObject>> m_objs;
+./ref_ptr_to_gc_managed_class.h:26:3: note: [blink-gc] scoped_refptr field 'm_objs' to a GC managed class declared here:
+  Vector<scoped_refptr<HeapObject>> m_objs;
   ^
 2 warnings generated.