replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move -Wstatic-float-init fixit into a note & don't recover as if constexpr 

llvm-svn: 173841
This commit is contained in:
David Blaikie 2013-01-29 22:26:08 +00:00
parent 276a08b5b1
commit 8505c29593
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -5311,6 +5311,7 @@ def ext_in_class_initializer_float_type : ExtWarn<
def ext_in_class_initializer_float_type_cxx11 : ExtWarn<
"in-class initializer for static data member of type %0 requires "
"'constexpr' specifier">, InGroup<StaticFloatInit>, DefaultError;
def note_in_class_initializer_float_type_cxx11 : Note<"add 'constexpr'">;
def err_in_class_initializer_literal_type : Error<
"in-class initializer for static data member of type %0 requires "
"'constexpr' specifier">;

15
clang/lib/Sema/SemaDecl.cpp
View File

@ -7203,15 +7203,12 @@ void Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init,
// In C++98, this is a GNU extension. In C++11, it is not, but we support
// it anyway and provide a fixit to add the 'constexpr'.
if (getLangOpts().CPlusPlus11) {
SemaDiagnosticBuilder D = Diag(VDecl->getLocation(),
diag::ext_in_class_initializer_float_type_cxx11);
D << DclT << Init->getSourceRange();
if (Diags.getDiagnosticLevel(diag::warn_initializer_out_of_order,
VDecl->getLocation()) >=
DiagnosticsEngine::Error) {
D << FixItHint::CreateInsertion(VDecl->getLocStart(), "constexpr ");
VDecl->setConstexpr(true);
}
Diag(VDecl->getLocation(),
diag::ext_in_class_initializer_float_type_cxx11)
<< DclT << Init->getSourceRange();
Diag(VDecl->getLocStart(),
diag::note_in_class_initializer_float_type_cxx11)
<< FixItHint::CreateInsertion(VDecl->getLocStart(), "constexpr ");
} else {
Diag(VDecl->getLocation(), diag::ext_in_class_initializer_float_type)
<< DclT << Init->getSourceRange();

2
clang/test/CXX/class/class.static/class.static.data/p3.cpp
View File

@ -13,7 +13,7 @@ struct S {
static const int d2 = 0;
static constexpr double e = 0.0; // ok
static const double f = 0.0; // expected-error {{requires 'constexpr' specifier}}
static const double f = 0.0; // expected-error {{requires 'constexpr' specifier}} expected-note {{add 'constexpr'}}
static char *const g = 0; // expected-error {{requires 'constexpr' specifier}}
static const NonLit h = NonLit(); // expected-error {{must be initialized out of line}}
};

2
clang/test/CXX/class/class.union/p2-0x.cpp
View File

@ -7,7 +7,7 @@ union U1 {
static const int k2 = k1;
static int k3 = k2; // expected-error {{non-const static data member must be initialized out of line}}
static constexpr double k4 = k2;
static const double k5 = k4; // expected-error {{requires 'constexpr' specifier}}
static const double k5 = k4; // expected-error {{requires 'constexpr' specifier}} expected-note {{add 'constexpr'}}
int n[k1 + 3];
};

4
clang/test/SemaCXX/cxx0x-class.cpp
View File

@ -20,8 +20,8 @@ namespace rdar8367341 {
float foo(); // expected-note {{here}}
struct A {
static const float x = 5.0f; // expected-warning {{requires 'constexpr'}}
static const float y = foo(); // expected-warning {{requires 'constexpr'}}
static const float x = 5.0f; // expected-warning {{requires 'constexpr'}} expected-note {{add 'constexpr'}}
static const float y = foo(); // expected-warning {{requires 'constexpr'}} expected-note {{add 'constexpr'}}
static constexpr float x2 = 5.0f;
static constexpr float y2 = foo(); // expected-error {{must be initialized by a constant expression}} expected-note {{non-constexpr function 'foo'}}
};

5
clang/test/SemaCXX/warn-static-const-float.cpp
View File

@ -10,9 +10,10 @@
#if NONE
// expected-no-diagnostics
#elif ERR
// expected-error@19 {{in-class initializer for static data member of type 'const double' requires 'constexpr' specifier}}
// expected-error@20 {{in-class initializer for static data member of type 'const double' requires 'constexpr' specifier}}
// expected-note@20 {{add 'constexpr'}}
#elif EXT
// expected-warning@19 {{in-class initializer for static data member of type 'const double' is a GNU extension}}
// expected-warning@20 {{in-class initializer for static data member of type 'const double' is a GNU extension}}
#endif
struct X {