[cfe-commits] r140809 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/SemaDecl.cpp test/SemaCXX/class.cpp test/SemaCXX/cxx0x-class.cpp

Richard Smith richard-llvm at metafoo.co.uk
Thu Sep 29 16:28:17 CDT 2011


Author: rsmith
Date: Thu Sep 29 16:28:14 2011
New Revision: 140809

URL: http://llvm.org/viewvc/llvm-project?rev=140809&view=rev
Log:
In C++0x, static const volatile data members cannot be initialized in-class.

Added:
    cfe/trunk/test/SemaCXX/cxx0x-class.cpp
Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/lib/Sema/SemaDecl.cpp
    cfe/trunk/test/SemaCXX/class.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=140809&r1=140808&r2=140809&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Thu Sep 29 16:28:14 2011
@@ -4077,6 +4077,8 @@
 
 def err_in_class_initializer_non_const : Error<
   "non-const static data member must be initialized out of line">;
+def err_in_class_initializer_volatile : Error<
+  "static const volatile data member must be initialized out of line">;
 def err_in_class_initializer_bad_type : Error<
   "static data member of type %0 must be initialized out of line">;
 def ext_in_class_initializer_float_type : ExtWarn<

Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=140809&r1=140808&r2=140809&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Thu Sep 29 16:28:14 2011
@@ -5852,12 +5852,13 @@
 
     // We allow integer constant expressions in all cases.
     } else if (T->isIntegralOrEnumerationType()) {
-      // FIXME: In C++0x, a non-constexpr const static data member with an
-      // in-class initializer cannot be volatile.
-
       // Check whether the expression is a constant expression.
       SourceLocation Loc;
-      if (Init->isValueDependent())
+      if (getLangOptions().CPlusPlus0x && T.isVolatileQualified())
+        // In C++0x, a non-constexpr const static data member with an
+        // in-class initializer cannot be volatile.
+        Diag(VDecl->getLocation(), diag::err_in_class_initializer_volatile);
+      else if (Init->isValueDependent())
         ; // Nothing to check.
       else if (Init->isIntegerConstantExpr(Context, &Loc))
         ; // Ok, it's an ICE!

Modified: cfe/trunk/test/SemaCXX/class.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/class.cpp?rev=140809&r1=140808&r2=140809&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/class.cpp (original)
+++ cfe/trunk/test/SemaCXX/class.cpp Thu Sep 29 16:28:14 2011
@@ -39,6 +39,7 @@
   static const NestedC ci = 0; // expected-error {{static data member of type 'const C::NestedC' must be initialized out of line}}
   static const int nci = vs; // expected-error {{in-class initializer is not a constant expression}}
   static const int vi = 0;
+  static const volatile int cvi = 0; // ok, illegal in C++0x
   static const E evi = 0;
 
   void m() {

Added: cfe/trunk/test/SemaCXX/cxx0x-class.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-class.cpp?rev=140809&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/cxx0x-class.cpp (added)
+++ cfe/trunk/test/SemaCXX/cxx0x-class.cpp Thu Sep 29 16:28:14 2011
@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++0x %s 
+
+int vs = 0;
+
+class C {
+public:
+  struct NestedC {
+    NestedC(int);
+  };
+
+  int i = 0;
+  static int si = 0; // expected-error {{non-const static data member must be initialized out of line}}
+  static const NestedC ci = 0; // expected-error {{static data member of type 'const C::NestedC' must be initialized out of line}}
+  static const int nci = vs; // expected-error {{in-class initializer is not a constant expression}}
+  static const int vi = 0;
+  static const volatile int cvi = 0; // expected-error {{static const volatile data member must be initialized out of line}}
+};
+
+namespace rdar8367341 {
+  float foo();
+
+  struct A {
+    static const float x = 5.0f; // expected-warning {{requires 'constexpr' specifier}}
+    static const float y = foo(); // expected-warning {{requires 'constexpr' specifier}} expected-error {{must be initialized by a constant expression}}
+    static constexpr float x2 = 5.0f;
+    static constexpr float y2 = foo(); // expected-error {{must be initialized by a constant expression}}
+  };
+}




More information about the cfe-commits mailing list