shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Fix zero-initialization fix-it for variable template

Browse Source 
Current version there is a fix-it for

template <class> constexpr int x = 0;
template <> constexpr int x<int>; // fix-it here
but it will cause

template <> constexpr int x = 0<int>;

Differential Revision: https://reviews.llvm.org/D139705
This commit is contained in:
v1nh1shungry 2023-01-19 12:35:09 -05:00 committed by Aaron Ballman
parent 2f8b920f95
commit b3faa1a87a
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/docs/ReleaseNotes.rst
View File

@ -350,6 +350,8 @@ Bug Fixes
This fixes `Issue 59765 <https://github.com/llvm/llvm-project/issues/59765>`_
- Reject in-class defaulting of previosly declared comparison operators. Fixes
`Issue 51227 <https://github.com/llvm/llvm-project/issues/51227>`_.
- Fix the bug of inserting the ``ZeroInitializationFixit`` before the template
argument list of ``VarTemplateSpecializationDecl``.
Improvements to Clang's diagnostics
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

16
clang/include/clang/AST/DeclTemplate.h
View File

@ -2926,6 +2926,14 @@ public:
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 @@ public:
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());

28
clang/test/FixIt/fixit-const-var-init.cpp Normal file
View File

@ -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 <class, class> const int b; // expected-error {{default initialization of an object of const type}}
// CHECK: fix-it:"{{.*}}":{6:36-6:36}:" = 0"
template <class T> const int b<int, T>; // expected-error {{default initialization of an object of const type}}
// CHECK: fix-it:"{{.*}}":{9:39-9:39}:" = 0"
template <> const int b<int, float>; // 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 <class, class> constexpr float d; // expected-error {{must be initialized by a constant expression}}
// CHECK: fix-it:"{{.*}}":{18:42-18:42}:" = 0.0"
template <class T> constexpr float d<T, int>; // expected-error {{must be initialized by a constant expression}}
// CHECK: fix-it:"{{.*}}":{21:45-21:45}:" = 0.0"
template <> constexpr float d<int, float>; // 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"