Always enable warn-raw-ptr's check of raw heap pointers.

tools/clang/blink_gc_plugin/BlinkGCPluginConsumer.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "BlinkGCPluginConsumer.h"
 
 #include <algorithm>
 #include <set>
 
 #include "CheckDispatchVisitor.h"
@@ skipping 195 matching lines @@
   diag_class_must_left_mostly_derive_gc_ = diagnostic_.getCustomDiagID(
       getErrorLevel(), kClassMustLeftMostlyDeriveGC);
   diag_class_requires_trace_method_ =
       diagnostic_.getCustomDiagID(getErrorLevel(), kClassRequiresTraceMethod);
   diag_base_requires_tracing_ =
       diagnostic_.getCustomDiagID(getErrorLevel(), kBaseRequiresTracing);
   diag_fields_require_tracing_ =
       diagnostic_.getCustomDiagID(getErrorLevel(), kFieldsRequireTracing);
   diag_class_contains_invalid_fields_ = diagnostic_.getCustomDiagID(
       getErrorLevel(), kClassContainsInvalidFields);
-  diag_class_contains_invalid_fields_warning_ = diagnostic_.getCustomDiagID(
-      getErrorLevel(), kClassContainsInvalidFields);
   diag_class_contains_gc_root_ =
       diagnostic_.getCustomDiagID(getErrorLevel(), kClassContainsGCRoot);
   diag_class_requires_finalization_ = diagnostic_.getCustomDiagID(
       getErrorLevel(), kClassRequiresFinalization);
   diag_class_does_not_require_finalization_ = diagnostic_.getCustomDiagID(
       DiagnosticsEngine::Warning, kClassDoesNotRequireFinalization);
   diag_finalizer_accesses_finalized_field_ = diagnostic_.getCustomDiagID(
       getErrorLevel(), kFinalizerAccessesFinalizedField);
   diag_finalizer_eagerly_finalized_field_ = diagnostic_.getCustomDiagID(
       getErrorLevel(), kFinalizerAccessesEagerlyFinalizedField);
@@ skipping 729 matching lines @@
   ReportDiagnostic(trace->getLocStart(), diag_fields_require_tracing_)
       << info->record();
   for (auto& field : info->GetFields())
     if (!field.second.IsProperlyTraced())
       NoteFieldRequiresTracing(info, field.first);
 }
 
 void BlinkGCPluginConsumer::ReportClassContainsInvalidFields(
     RecordInfo* info,
     const CheckFieldsVisitor::Errors& errors) {
-  bool only_warnings = options_.warn_raw_ptr;
-  for (auto& error : errors)
-    if (!CheckFieldsVisitor::IsWarning(error.second))
-      only_warnings = false;
 
   ReportDiagnostic(info->record()->getLocStart(),
-                   only_warnings ?
-                   diag_class_contains_invalid_fields_warning_ :
                    diag_class_contains_invalid_fields_)
       << info->record();
 
   for (auto& error : errors) {
     unsigned note;
-    if (CheckFieldsVisitor::IsRawPtrError(error.second)) {
+    if (error.second == CheckFieldsVisitor::kRawPtrToGCManaged) {
       note = diag_raw_ptr_to_gc_managed_class_note_;
-    } else if (CheckFieldsVisitor::IsReferencePtrError(error.second)) {
-      note = diag_reference_ptr_to_gc_managed_class_note_;
     } else if (error.second == CheckFieldsVisitor::kRefPtrToGCManaged) {
       note = diag_ref_ptr_to_gc_managed_class_note_;
+    } else if (error.second == CheckFieldsVisitor::kReferencePtrToGCManaged) {
+      note = diag_reference_ptr_to_gc_managed_class_note_;
     } else if (error.second == CheckFieldsVisitor::kOwnPtrToGCManaged) {
       note = diag_own_ptr_to_gc_managed_class_note_;
     } else if (error.second == CheckFieldsVisitor::kMemberToGCUnmanaged) {
       note = diag_member_to_gc_unmanaged_class_note_;
     } else if (error.second == CheckFieldsVisitor::kMemberInUnmanaged) {
       note = diag_member_in_unmanaged_class_note_;
     } else if (error.second == CheckFieldsVisitor::kPtrFromHeapToStack) {
       note = diag_stack_allocated_field_note_;
     } else if (error.second == CheckFieldsVisitor::kGCDerivedPartObject) {
       note = diag_part_object_to_gc_derived_class_note_;
@@ skipping 196 matching lines @@
 void BlinkGCPluginConsumer::NoteField(FieldDecl* field, unsigned note) {
   ReportDiagnostic(field->getLocStart(), note) << field;
 }
 
 void BlinkGCPluginConsumer::NoteOverriddenNonVirtualTrace(
     CXXMethodDecl* overridden) {
   ReportDiagnostic(overridden->getLocStart(),
                    diag_overridden_non_virtual_trace_note_)
       << overridden;
 }