Author: Sam McCall Date: 2021-12-15T14:30:54+01:00 New Revision: e7007b69d43b36032975d759ab4ae473fb389851
URL: https://github.com/llvm/llvm-project/commit/e7007b69d43b36032975d759ab4ae473fb389851 DIFF: https://github.com/llvm/llvm-project/commit/e7007b69d43b36032975d759ab4ae473fb389851.diff LOG: [Sema] Add FixIt when a C++ out-of-line method has extra/missing const Differential Revision: https://reviews.llvm.org/D115567 Added: clang/test/FixIt/member-mismatch.cpp Modified: clang/lib/Sema/SemaDecl.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 421ca95bb5430..b1312a7ccc512 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -8504,7 +8504,14 @@ static NamedDecl *DiagnoseInvalidRedeclaration( << NewFD->getParamDecl(Idx - 1)->getType(); } else if (FDisConst != NewFDisConst) { SemaRef.Diag(FD->getLocation(), diag::note_member_def_close_const_match) - << NewFDisConst << FD->getSourceRange().getEnd(); + << NewFDisConst << FD->getSourceRange().getEnd() + << (NewFDisConst + ? FixItHint::CreateRemoval(ExtraArgs.D.getFunctionTypeInfo() + .getConstQualifierLoc()) + : FixItHint::CreateInsertion(ExtraArgs.D.getFunctionTypeInfo() + .getRParenLoc() + .getLocWithOffset(1), + " const")); } else SemaRef.Diag(FD->getLocation(), IsMember ? diag::note_member_def_close_match diff --git a/clang/test/FixIt/member-mismatch.cpp b/clang/test/FixIt/member-mismatch.cpp new file mode 100644 index 0000000000000..2d2aec2e176b2 --- /dev/null +++ b/clang/test/FixIt/member-mismatch.cpp @@ -0,0 +1,12 @@ +// RUN: %clang_cc1 -verify %s +// RUN: not %clang_cc1 -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck %s + +class Foo { + int get() const; // expected-note {{because it is const qualified}} + void set(int); // expected-note {{because it is not const qualified}} +}; + +// CHECK: fix-it:"{{.*}}":{[[@LINE+1]]:15-[[@LINE+1]]:15}:" const" +int Foo::get() {} // expected-error {{does not match any declaration}} +// CHECK: fix-it:"{{.*}}":{[[@LINE+1]]:20-[[@LINE+1]]:26}:"" +void Foo::set(int) const {} // expected-error {{does not match any declaration}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
