v1nh1shungry created this revision.
v1nh1shungry added reviewers: aaron.ballman, erichkeane.
Herald added a project: All.
v1nh1shungry requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Current version there is a fix-it for
cpp
template <class> constexpr int x = 0;
template <> constexpr int x<int>; // fix-it here
but it will cause
cpp
template <> constexpr int x = 0<int>;
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D139705
Files:
clang/lib/Sema/SemaInit.cpp
clang/test/FixIt/fixit-const-var-init.cpp
Index: clang/test/FixIt/fixit-const-var-init.cpp
===================================================================
--- /dev/null
+++ clang/test/FixIt/fixit-const-var-init.cpp
@@ -0,0 +1,25 @@
+// 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"
Index: clang/lib/Sema/SemaInit.cpp
===================================================================
--- clang/lib/Sema/SemaInit.cpp
+++ clang/lib/Sema/SemaInit.cpp
@@ -3860,8 +3860,20 @@
if (VD->getInit() || VD->getEndLoc().isMacroID())
return false;
+ SourceLocation EndLoc = VD->getEndLoc();
+ if (const auto *VTSD = dyn_cast<VarTemplateSpecializationDecl>(VD)) {
+ if (const auto *VTPSD =
+ dyn_cast<VarTemplatePartialSpecializationDecl>(VD)) {
+ if (const ASTTemplateArgumentListInfo *Info =
+ VTPSD->getTemplateArgsAsWritten())
+ EndLoc = Info->getRAngleLoc();
+ }
+ if (const ASTTemplateArgumentListInfo *Info = VTSD->getTemplateArgsInfo())
+ EndLoc = Info->getRAngleLoc();
+ }
+
QualType VariableTy = VD->getType().getCanonicalType();
- SourceLocation Loc = S.getLocForEndOfToken(VD->getEndLoc());
+ SourceLocation Loc = S.getLocForEndOfToken(EndLoc);
std::string Init = S.getFixItZeroInitializerForType(VariableTy, Loc);
if (!Init.empty()) {
Sequence.AddZeroInitializationStep(Entity.getType());
Index: clang/test/FixIt/fixit-const-var-init.cpp
===================================================================
--- /dev/null
+++ clang/test/FixIt/fixit-const-var-init.cpp
@@ -0,0 +1,25 @@
+// 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"
Index: clang/lib/Sema/SemaInit.cpp
===================================================================
--- clang/lib/Sema/SemaInit.cpp
+++ clang/lib/Sema/SemaInit.cpp
@@ -3860,8 +3860,20 @@
if (VD->getInit() || VD->getEndLoc().isMacroID())
return false;
+ SourceLocation EndLoc = VD->getEndLoc();
+ if (const auto *VTSD = dyn_cast<VarTemplateSpecializationDecl>(VD)) {
+ if (const auto *VTPSD =
+ dyn_cast<VarTemplatePartialSpecializationDecl>(VD)) {
+ if (const ASTTemplateArgumentListInfo *Info =
+ VTPSD->getTemplateArgsAsWritten())
+ EndLoc = Info->getRAngleLoc();
+ }
+ if (const ASTTemplateArgumentListInfo *Info = VTSD->getTemplateArgsInfo())
+ EndLoc = Info->getRAngleLoc();
+ }
+
QualType VariableTy = VD->getType().getCanonicalType();
- SourceLocation Loc = S.getLocForEndOfToken(VD->getEndLoc());
+ SourceLocation Loc = S.getLocForEndOfToken(EndLoc);
std::string Init = S.getFixItZeroInitializerForType(VariableTy, Loc);
if (!Init.empty()) {
Sequence.AddZeroInitializationStep(Entity.getType());
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
