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

[Rafael Espindola]

Author: rafael
Date: Mon Mar 22 13:10:25 2010
New Revision: 99188

URL: http://llvm.org/viewvc/llvm-project?rev=99188&view=rev
Log:
revert r99174. It caused PR6677. Will try to debug why tonight.


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

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=99188&r1=99187&r2=99188&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Mon Mar 22 13:10:25 2010
@@ -5889,7 +5889,7 @@
     break;
 
   case TSK_ExplicitInstantiationDeclaration:
-    return false;
+    return true; //FIXME: This looks wrong.
 
   case TSK_ExplicitInstantiationDefinition:
     // This is method of a explicit instantiation; mark all of the virtual

Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=99188&r1=99187&r2=99188&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Mon Mar 22 13:10:25 2010
@@ -4388,12 +4388,8 @@
   // Instantiate the members of this class template specialization.
   Def = cast_or_null<ClassTemplateSpecializationDecl>(
                                        Specialization->getDefinition());
-  if (Def) {
-    // Fix a TSK_ExplicitInstantiationDeclaration followed by a
-    // TSK_ExplicitInstantiationDefinition
-    Def->setTemplateSpecializationKind(TSK);
+  if (Def)
     InstantiateClassTemplateSpecializationMembers(TemplateNameLoc, Def, TSK);
-  }
 
   return DeclPtrTy::make(Specialization);
 }