commit 7b19cb116d0909de72dc8242b0a4e6c5ed39d421
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Jan 14 01:55:13 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Jan 14 01:55:13 2013 +0000
tree 717d8de8c6a0918bd20d1cb3aaf2c4ccb24f9a16
parent 05756dc8d11cd2054e0cb94f0302e4eb39acc68e

*this is const in a trailing-return-type for a constexpr member function.


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

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index bd79e56..1fbe6b3 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -4761,7 +4761,9 @@
           Actions.CurContext->isRecord()));
       Sema::CXXThisScopeRAII ThisScope(Actions,
                                dyn_cast<CXXRecordDecl>(Actions.CurContext),
-                               DS.getTypeQualifiers(),
+                               DS.getTypeQualifiers() |
+                               (D.getDeclSpec().isConstexprSpecified()
+                                  ? Qualifiers::Const : 0),
                                IsCXX11MemberFunction);
 
       // Parse exception-specification[opt].