[cfe-commits] r160393 - in /cfe/trunk: lib/AST/Expr.cpp lib/Sema/SemaExpr.cpp test/SemaCXX/pr13353.cpp

[Rafael Espindola]

Author: rafael
Date: Tue Jul 17 15:24:05 2012
New Revision: 160393

URL: http://llvm.org/viewvc/llvm-project?rev=160393&view=rev
Log:
Handle the case where the base type is not dependent, but the derived one is.
Fixes pr13353.cpp.

Added:
    cfe/trunk/test/SemaCXX/pr13353.cpp
Modified:
    cfe/trunk/lib/AST/Expr.cpp
    cfe/trunk/lib/Sema/SemaExpr.cpp

Modified: cfe/trunk/lib/AST/Expr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Expr.cpp?rev=160393&r1=160392&r2=160393&view=diff
==============================================================================
--- cfe/trunk/lib/AST/Expr.cpp (original)
+++ cfe/trunk/lib/AST/Expr.cpp Tue Jul 17 15:24:05 2012
@@ -40,6 +40,9 @@
   if (const PointerType *PTy = DerivedType->getAs<PointerType>())
     DerivedType = PTy->getPointeeType();
 
+  if (DerivedType->isDependentType())
+    return NULL;
+
   const RecordType *Ty = DerivedType->castAs<RecordType>();
   Decl *D = Ty->getDecl();
   return cast<CXXRecordDecl>(D);

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=160393&r1=160392&r2=160393&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Tue Jul 17 15:24:05 2012
@@ -10893,8 +10893,6 @@
   if (!MD)
     return;
   const Expr *Base = ME->getBase();
-  if (Base->getType()->isDependentType())
-    return;
   const CXXRecordDecl *MostDerivedClassDecl = Base->getBestDynamicClassType();
   if (!MostDerivedClassDecl)
     return;

Added: cfe/trunk/test/SemaCXX/pr13353.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/pr13353.cpp?rev=160393&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/pr13353.cpp (added)
+++ cfe/trunk/test/SemaCXX/pr13353.cpp Tue Jul 17 15:24:05 2012
@@ -0,0 +1,13 @@
+// RUN: %clang_cc1 -fsyntax-only  %s
+struct foo {
+  virtual void bar() ;
+};
+template<typename T>
+class zed : public foo {
+};
+template<typename T>
+class bah : public zed<T> {
+  void f() {
+     const_cast<foo *>(this->g())->bar();
+  }
+};