commit c3d2ebb60f6048cf99a5c30ce77b9ec9118b635b
author Richard Smith <richard-llvm@metafoo.co.uk> Fri Jun 07 02:33:37 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Fri Jun 07 02:33:37 2013 +0000
tree 097f01e3d2d992fa92d4396cd9c85b84ae9227ea
parent a1acb49188281013ca1eea3ab1b758f1adef0377

PR16243: Use CXXThisOverride during template instantiation, and fix up the
places which weren't setting it up properly. This allows us to get the right
cv-qualifiers for 'this' when it appears outside a method body in a class
template.

llvm-svn: 183483

clang/lib/Parse/ParseDecl.cpp

diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index cb0dc37..03e4879 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -1063,9 +1063,8 @@
     RecordDecl *RD = dyn_cast_or_null<RecordDecl>(D->getDeclContext());
 
     // Allow 'this' within late-parsed attributes.
-    Sema::CXXThisScopeRAII ThisScope(Actions, RD,
-                                     /*TypeQuals=*/0,
-                                     ND && RD && ND->isCXXInstanceMember());
+    Sema::CXXThisScopeRAII ThisScope(Actions, RD, /*TypeQuals=*/0,
+                                     ND && ND->isCXXInstanceMember());
 
     if (LA.Decls.size() == 1) {
       // If the Decl is templatized, add template parameters to scope.