Added fixit notes for -Wfinal-dtor-non-final-class

davidbolvansky · davidbolvansky · commit c50da3d0525c · 2019-09-03T10:32:21.000Z
llvm-svn: 370737
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -6241,10 +6241,14 @@ void Sema::CheckCompletedCXXClass(CXXRecordDecl *Record) {
     if (const CXXDestructorDecl *dtor = Record->getDestructor()) {
       if (const FinalAttr *FA = dtor->getAttr<FinalAttr>()) {
         Diag(FA->getLocation(), diag::warn_final_dtor_non_final_class)
-          << FA->isSpelledAsSealed();
-        Diag(Record->getLocation(), diag::note_final_dtor_non_final_class_silence)
-          << Context.getRecordType(Record)
-          << FA->isSpelledAsSealed();
+            << FA->isSpelledAsSealed()
+            << FixItHint::CreateRemoval(FA->getLocation())
+            << FixItHint::CreateInsertion(
+                   getLocForEndOfToken(Record->getLocation()),
+                   (FA->isSpelledAsSealed() ? " sealed" : " final"));
+        Diag(Record->getLocation(),
+             diag::note_final_dtor_non_final_class_silence)
+            << Context.getRecordType(Record) << FA->isSpelledAsSealed();
       }
     }
   }
diff --git a/clang/test/SemaCXX/warn-final-dtor-non-final-class.cpp b/clang/test/SemaCXX/warn-final-dtor-non-final-class.cpp
@@ -1,11 +1,14 @@
 // RUN: %clang_cc1 -fsyntax-only -std=c++11 -verify %s -Wfinal-dtor-non-final-class
+// RUN: %clang_cc1 -fsyntax-only -std=c++11 %s -Wfinal-dtor-non-final-class -fdiagnostics-parseable-fixits 2>&1 | FileCheck %s
 
 class A {
     ~A();
 };
 
 class B { // expected-note {{mark 'B' as 'final' to silence this warning}}
+    // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:8-[[@LINE-1]]:8}:" final"
     virtual ~B() final; // expected-warning {{class with destructor marked 'final' cannot be inherited from}}
+    // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:18-[[@LINE-1]]:23}:""
 };
 
 class C final {

Original file line number	Diff line number	Diff line change
`@@ -6241,10 +6241,14 @@ void Sema::CheckCompletedCXXClass(CXXRecordDecl *Record) {`
`6241`	`6241`	`if (const CXXDestructorDecl *dtor = Record->getDestructor()) {`
`6242`	`6242`	`if (const FinalAttr *FA = dtor->getAttr<FinalAttr>()) {`
`6243`	`6243`	`Diag(FA->getLocation(), diag::warn_final_dtor_non_final_class)`
`6244`		`- << FA->isSpelledAsSealed();`
`6245`		`- Diag(Record->getLocation(), diag::note_final_dtor_non_final_class_silence)`
`6246`		`- << Context.getRecordType(Record)`
`6247`		`- << FA->isSpelledAsSealed();`
	`6244`	`+ << FA->isSpelledAsSealed()`
	`6245`	`+ << FixItHint::CreateRemoval(FA->getLocation())`
	`6246`	`+ << FixItHint::CreateInsertion(`
	`6247`	`+ getLocForEndOfToken(Record->getLocation()),`
	`6248`	`+ (FA->isSpelledAsSealed() ? " sealed" : " final"));`
	`6249`	`+ Diag(Record->getLocation(),`
	`6250`	`+ diag::note_final_dtor_non_final_class_silence)`
	`6251`	`+ << Context.getRecordType(Record) << FA->isSpelledAsSealed();`
`6248`	`6252`	`}`
`6249`	`6253`	`}`
`6250`	`6254`	`}`