| Index: tools/clang/blink_gc_plugin/CheckFieldsVisitor.cpp
|
| diff --git a/tools/clang/blink_gc_plugin/CheckFieldsVisitor.cpp b/tools/clang/blink_gc_plugin/CheckFieldsVisitor.cpp
|
| index b4eb04b5d0d88aecd8d7ed8bdb8ac233b30d0108..f08710f88479595b5077eb4f5b9540e97ef5d946 100644
|
| --- a/tools/clang/blink_gc_plugin/CheckFieldsVisitor.cpp
|
| +++ b/tools/clang/blink_gc_plugin/CheckFieldsVisitor.cpp
|
| @@ -93,14 +93,11 @@ void CheckFieldsVisitor::AtValue(Value* edge) {
|
| current_, InvalidSmartPtr(Parent())));
|
| return;
|
| }
|
| - if (options_.warn_raw_ptr && Parent()->IsRawPtr()) {
|
| - if (static_cast<RawPtr*>(Parent())->HasReferenceType()) {
|
| - invalid_fields_.push_back(std::make_pair(
|
| - current_, kReferencePtrToGCManagedWarning));
|
| - } else {
|
| - invalid_fields_.push_back(std::make_pair(
|
| - current_, kRawPtrToGCManagedWarning));
|
| - }
|
| + if (Parent()->IsRawPtr()) {
|
| + RawPtr* rawPtr = static_cast<RawPtr*>(Parent());
|
| + Error error = rawPtr->HasReferenceType() ?
|
| + kReferencePtrToGCManaged : kRawPtrToGCManaged;
|
| + invalid_fields_.push_back(std::make_pair(current_, error));
|
| }
|
| }
|
|
|
| @@ -109,24 +106,6 @@ void CheckFieldsVisitor::AtCollection(Collection* edge) {
|
| invalid_fields_.push_back(std::make_pair(current_, kOwnPtrToGCManaged));
|
| }
|
|
|
| -bool CheckFieldsVisitor::IsWarning(Error error) {
|
| - if (error == kRawPtrToGCManagedWarning)
|
| - return true;
|
| - if (error == kReferencePtrToGCManagedWarning)
|
| - return true;
|
| - return false;
|
| -}
|
| -
|
| -bool CheckFieldsVisitor::IsRawPtrError(Error error) {
|
| - return (error == kRawPtrToGCManaged ||
|
| - error == kRawPtrToGCManagedWarning);
|
| -}
|
| -
|
| -bool CheckFieldsVisitor::IsReferencePtrError(Error error) {
|
| - return (error == kReferencePtrToGCManaged ||
|
| - error == kReferencePtrToGCManagedWarning);
|
| -}
|
| -
|
| CheckFieldsVisitor::Error CheckFieldsVisitor::InvalidSmartPtr(Edge* ptr) {
|
| if (ptr->IsRawPtr()) {
|
| if (static_cast<RawPtr*>(ptr)->HasReferenceType())
|
|
|