2 files changed, 16 insertions, 20 deletions
diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index d39ad72bd7..8b2ef2a81a 100644
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -383,8 +383,22 @@ public:
   }
   
   template <typename T>
-  void dropAttr();
-  
+  void dropAttr() {
+    if (!HasAttrs) return;
+    
+    AttrVec &Attrs = getAttrs();
+    for (unsigned i = 0, e = Attrs.size(); i != e; /* in loop */) {
+      if (isa<T>(Attrs[i])) {
+        Attrs.erase(Attrs.begin() + i);
+        --e;
+      }
+      else
+        ++i;
+    }
+    if (Attrs.empty())
+      HasAttrs = false;
+  }
+    
   template <typename T>
   specific_attr_iterator<T> specific_attr_begin() const {
     return specific_attr_iterator<T>(attr_begin());
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 575b82d9af..1766d39c14 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -571,24 +571,6 @@ Decl *Decl::castFromDeclContext (const DeclContext *D) {
   }
 }
 
-template <typename T>
-void Decl::dropAttr() {
-  if (!HasAttrs) return;
-  AttrVec &Attrs = getASTContext().getDeclAttrs(this);
-  for (unsigned i = 0, e = Attrs.size(); i != e; /* in loop */) {
-    if (isa<T>(Attrs[i])) {
-      Attrs.erase(Attrs.begin() + i);
-      --e;
-    }
-    else
-      ++i;
-  }
-  if (Attrs.empty())
-    HasAttrs = false;
-}
-// Force instantiation for WeakImportAttr which gets used.
-template void Decl::dropAttr<WeakImportAttr>();
-
 DeclContext *Decl::castToDeclContext(const Decl *D) {
   Decl::Kind DK = D->getKind();
   switch(DK) {