Author: dblaikie Date: Wed Mar 20 12:42:13 2013 New Revision: 177546 URL: http://llvm.org/viewvc/llvm-project?rev=177546&view=rev Log: PR7256: Provide a fixit for incorrect destructor declarations
Fix by Ismail Pazarbasi ([email protected]), review by Dmitri Gribenko. Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp cfe/trunk/test/FixIt/fixit.cpp Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=177546&r1=177545&r2=177546&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original) +++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Wed Mar 20 12:42:13 2013 @@ -264,8 +264,16 @@ ParsedType Sema::getDestructorName(Sourc } else if (ObjectTypePtr) Diag(NameLoc, diag::err_ident_in_dtor_not_a_type) << &II; - else - Diag(NameLoc, diag::err_destructor_class_name); + else { + SemaDiagnosticBuilder DtorDiag = Diag(NameLoc, + diag::err_destructor_class_name); + if (S) { + const DeclContext *Ctx = static_cast<DeclContext*>(S->getEntity()); + if (const CXXRecordDecl *Class = dyn_cast_or_null<CXXRecordDecl>(Ctx)) + DtorDiag << FixItHint::CreateReplacement(SourceRange(NameLoc), + Class->getNameAsString()); + } + } return ParsedType(); } Modified: cfe/trunk/test/FixIt/fixit.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit.cpp?rev=177546&r1=177545&r2=177546&view=diff ============================================================================== --- cfe/trunk/test/FixIt/fixit.cpp (original) +++ cfe/trunk/test/FixIt/fixit.cpp Wed Mar 20 12:42:13 2013 @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -pedantic -Wall -Wno-comment -verify -fcxx-exceptions -x c++ %s +// RUN: %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits -x c++ %s 2>&1 | FileCheck %s // RUN: cp %s %t // RUN: not %clang_cc1 -pedantic -Wall -Wno-comment -fcxx-exceptions -fixit -x c++ %t // RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror -Wno-comment -fcxx-exceptions -x c++ %t @@ -299,3 +300,10 @@ class foo { } int i(); }; + +namespace dtor_fixit { + class foo { + ~bar() { } // expected-error {{expected the class name after '~' to name a destructor}} + // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:6-[[@LINE-1]]:9}:"foo" + }; +} _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
