| Index: tools/clang/blink_gc_plugin/RecordInfo.cpp
|
| diff --git a/tools/clang/blink_gc_plugin/RecordInfo.cpp b/tools/clang/blink_gc_plugin/RecordInfo.cpp
|
| index f49c862163c18cd6ee4bf4ff70946afe9605b0c5..1eef514f929a49ad9f4c31449caaa657efaf5dad 100644
|
| --- a/tools/clang/blink_gc_plugin/RecordInfo.cpp
|
| +++ b/tools/clang/blink_gc_plugin/RecordInfo.cpp
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "Config.h"
|
| #include "RecordInfo.h"
|
| -#include "clang/Sema/Sema.h"
|
|
|
| using namespace clang;
|
| using std::string;
|
| @@ -589,21 +588,6 @@
|
| return 0;
|
| }
|
|
|
| - if (Config::IsUniquePtr(info->name()) && info->GetTemplateArgs(1, &args)) {
|
| - // Check that this is std::unique_ptr
|
| - NamespaceDecl* ns =
|
| - dyn_cast<NamespaceDecl>(info->record()->getDeclContext());
|
| - if (!ns)
|
| - return 0;
|
| -
|
| - clang::Sema& sema = cache_->instance().getSema();
|
| - if (ns != sema.getStdNamespace())
|
| - return 0;
|
| - if (Edge* ptr = CreateEdge(args[0]))
|
| - return new UniquePtr(ptr);
|
| - return 0;
|
| - }
|
| -
|
| if (Config::IsMember(info->name()) && info->GetTemplateArgs(1, &args)) {
|
| if (Edge* ptr = CreateEdge(args[0]))
|
| return new Member(ptr);
|
| @@ -616,8 +600,7 @@
|
| return 0;
|
| }
|
|
|
| - bool is_persistent = Config::IsPersistent(info->name());
|
| - if (is_persistent || Config::IsCrossThreadPersistent(info->name())) {
|
| + if (Config::IsPersistent(info->name())) {
|
| // Persistent might refer to v8::Persistent, so check the name space.
|
| // TODO: Consider using a more canonical identification than names.
|
| NamespaceDecl* ns =
|
| @@ -626,12 +609,8 @@
|
| return 0;
|
| if (!info->GetTemplateArgs(1, &args))
|
| return 0;
|
| - if (Edge* ptr = CreateEdge(args[0])) {
|
| - if (is_persistent)
|
| - return new Persistent(ptr);
|
| - else
|
| - return new CrossThreadPersistent(ptr);
|
| - }
|
| + if (Edge* ptr = CreateEdge(args[0]))
|
| + return new Persistent(ptr);
|
| return 0;
|
| }
|
|
|
|
|