commit 9ec0ef31c3bc40612e8bf47bd7d265d5e7c01ff9
author Eli Friedman <eli.friedman@gmail.com> Fri Jan 13 02:31:53 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Fri Jan 13 02:31:53 2012 +0000
tree d551d40312bfc4628da6a35c8ba7fce3bd554f42
parent 059d578c7d45f687a81bcc97ab80404256a5287f

constexpr is allowed on static member functions of non-literal classes.  Per report on cfe-dev.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148090 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaDeclCXX.cpp

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 9fcac22..9bb2639 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -3675,7 +3675,7 @@
     for (CXXRecordDecl::method_iterator M = Record->method_begin(),
                                      MEnd = Record->method_end();
          M != MEnd; ++M) {
-      if ((*M)->isConstexpr()) {
+      if (M->isConstexpr() && M->isInstance()) {
         switch (Record->getTemplateSpecializationKind()) {
         case TSK_ImplicitInstantiation:
         case TSK_ExplicitInstantiationDeclaration: