[cfe-commits] r124201 - in /cfe/trunk/lib/Sema: Sema.cpp SemaDeclCXX.cpp

[Anders Carlsson]

Author: andersca
Date: Tue Jan 25 12:08:22 2011
New Revision: 124201

URL: http://llvm.org/viewvc/llvm-project?rev=124201&view=rev
Log:
Don't insert class templates into the DynamicClasses vector.

Modified:
    cfe/trunk/lib/Sema/Sema.cpp
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/lib/Sema/Sema.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.cpp?rev=124201&r1=124200&r2=124201&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.cpp (original)
+++ cfe/trunk/lib/Sema/Sema.cpp Tue Jan 25 12:08:22 2011
@@ -290,6 +290,8 @@
     // this translation unit, then those vtables are considered "used" and must
     // be emitted.
     for (unsigned I = 0, N = DynamicClasses.size(); I != N; ++I) {
+      assert(!DynamicClasses[I]->isDependentType() &&
+             "Should not see dependent types here!");
       if (const CXXMethodDecl *KeyFunction
           = Context.getKeyFunction(DynamicClasses[I])) {
         const FunctionDecl *Definition = 0;

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=124201&r1=124200&r2=124201&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Tue Jan 25 12:08:22 2011
@@ -2746,7 +2746,7 @@
     }
   }
 
-  if (Record->isDynamicClass())
+  if (Record->isDynamicClass() && !Record->isDependentType())
     DynamicClasses.push_back(Record);
 
   if (Record->getIdentifier()) {