[cfe-commits] r75291 - in /cfe/trunk: lib/AST/DeclCXX.cpp test/SemaCXX/decltype-this.cpp test/SemaTemplate/instantiate-function-1.cpp

[Anders Carlsson]

Author: andersca
Date: Fri Jul 10 16:35:09 2009
New Revision: 75291

URL: http://llvm.org/viewvc/llvm-project?rev=75291&view=rev
Log:
Fix type of 'this' and add a decltype test.

Added:
    cfe/trunk/test/SemaCXX/decltype-this.cpp
Modified:
    cfe/trunk/lib/AST/DeclCXX.cpp
    cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp

Modified: cfe/trunk/lib/AST/DeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclCXX.cpp?rev=75291&r1=75290&r2=75291&view=diff

==============================================================================
--- cfe/trunk/lib/AST/DeclCXX.cpp (original)
+++ cfe/trunk/lib/AST/DeclCXX.cpp Fri Jul 10 16:35:09 2009
@@ -360,7 +360,7 @@
   else
     ClassTy = C.getTagDeclType(const_cast<CXXRecordDecl*>(getParent()));
   ClassTy = ClassTy.getWithAdditionalQualifiers(getTypeQualifiers());
-  return C.getPointerType(ClassTy).withConst();
+  return C.getPointerType(ClassTy);
 }
 
 CXXBaseOrMemberInitializer::

Added: cfe/trunk/test/SemaCXX/decltype-this.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/decltype-this.cpp?rev=75291&view=auto

==============================================================================
--- cfe/trunk/test/SemaCXX/decltype-this.cpp (added)
+++ cfe/trunk/test/SemaCXX/decltype-this.cpp Fri Jul 10 16:35:09 2009
@@ -0,0 +1,15 @@
+// RUN: clang-cc -fsyntax-only -verify -std=c++0x %t 
+template<typename T, typename U> struct is_same {
+  static const bool value = false;
+};
+
+template<typename T> struct is_same<T, T> {
+  static const bool value = true;
+};
+
+struct S {
+  void f() { static_assert(is_same<decltype(this), S*>::value, ""); }
+  void g() const { static_assert(is_same<decltype(this), const S*>::value, ""); }
+  void h() volatile { static_assert(is_same<decltype(this), volatile S*>::value, ""); }
+  void i() const volatile { static_assert(is_same<decltype(this), const volatile S*>::value, ""); }
+};

Modified: cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp?rev=75291&r1=75290&r2=75291&view=diff

==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp (original)
+++ cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp Fri Jul 10 16:35:09 2009
@@ -140,7 +140,7 @@
     tp->f;
 
     this->f;
-    this.f; // expected-error{{member reference base type 'Member0<T> *const' is not a structure or union}}
+    this.f; // expected-error{{member reference base type 'Member0<T> *' is not a structure or union}}
   }
 };