diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -350,6 +350,8 @@ This fixes `Issue 59765 `_ - Reject in-class defaulting of previosly declared comparison operators. Fixes `Issue 51227 `_. +- Fix the bug of inserting the ``ZeroInitializationFixit`` before the template + argument list of ``VarTemplateSpecializationDecl``. Improvements to Clang's diagnostics ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/include/clang/AST/DeclTemplate.h b/clang/include/clang/AST/DeclTemplate.h --- a/clang/include/clang/AST/DeclTemplate.h +++ b/clang/include/clang/AST/DeclTemplate.h @@ -2926,6 +2926,14 @@ return ExplicitInfo ? ExplicitInfo->TemplateKeywordLoc : SourceLocation(); } + SourceRange getSourceRange() const override LLVM_READONLY { + if (isExplicitSpecialization()) { + if (const ASTTemplateArgumentListInfo *Info = getTemplateArgsInfo()) + return SourceRange(getOuterLocStart(), Info->getRAngleLoc()); + } + return VarDecl::getSourceRange(); + } + void Profile(llvm::FoldingSetNodeID &ID) const { Profile(ID, TemplateArgs->asArray(), getASTContext()); } @@ -3083,6 +3091,14 @@ return First->InstantiatedFromMember.setInt(true); } + SourceRange getSourceRange() const override LLVM_READONLY { + if (isExplicitSpecialization()) { + if (const ASTTemplateArgumentListInfo *Info = getTemplateArgsAsWritten()) + return SourceRange(getOuterLocStart(), Info->getRAngleLoc()); + } + return VarDecl::getSourceRange(); + } + void Profile(llvm::FoldingSetNodeID &ID) const { Profile(ID, getTemplateArgs().asArray(), getTemplateParameters(), getASTContext()); diff --git a/clang/test/FixIt/fixit-const-var-init.cpp b/clang/test/FixIt/fixit-const-var-init.cpp new file mode 100644 --- /dev/null +++ b/clang/test/FixIt/fixit-const-var-init.cpp @@ -0,0 +1,28 @@ +// RUN: not %clang_cc1 -fdiagnostics-parseable-fixits -x c++ -std=c++14 %s 2>&1 | FileCheck %s + +const int a; // expected-error {{default initialization of an object of const type}} +// CHECK: fix-it:"{{.*}}":{3:12-3:12}:" = 0" + +template const int b; // expected-error {{default initialization of an object of const type}} +// CHECK: fix-it:"{{.*}}":{6:36-6:36}:" = 0" + +template const int b; // expected-error {{default initialization of an object of const type}} +// CHECK: fix-it:"{{.*}}":{9:39-9:39}:" = 0" + +template <> const int b; // expected-error {{default initialization of an object of const type}} +// CHECK: fix-it:"{{.*}}":{12:36-12:36}:" = 0" + +constexpr float c; // expected-error {{must be initialized by a constant expression}} +// CHECK: fix-it:"{{.*}}":{15:18-15:18}:" = 0.0" + +template constexpr float d; // expected-error {{must be initialized by a constant expression}} +// CHECK: fix-it:"{{.*}}":{18:42-18:42}:" = 0.0" + +template constexpr float d; // expected-error {{must be initialized by a constant expression}} +// CHECK: fix-it:"{{.*}}":{21:45-21:45}:" = 0.0" + +template <> constexpr float d; // expected-error {{must be initialized by a constant expression}} +// CHECK: fix-it:"{{.*}}":{24:42-24:42}:" = 0.0" + +void (* const func)(int, int); // expected-error {{default initialization of an object of const type}} +// CHECK: fix-it:"{{.*}}":{27:30-27:30}:" = nullptr"