2 files changed, 15 insertions, 3 deletions
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 1766d39c14..c183e61df8 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -520,6 +520,20 @@ void Decl::dropAttrs() {
   getASTContext().eraseDeclAttrs(this);
 }
 
+void Decl::dropWeakImportAttr() {
+  if (!HasAttrs) return;
+  AttrVec &Attrs = getASTContext().getDeclAttrs(this);
+  for (llvm::SmallVectorImpl<Attr*>::iterator A = Attrs.begin();
+       A != Attrs.end(); ++A) {
+    if (isa<WeakImportAttr>(*A)) {
+      Attrs.erase(A);
+      break;
+    }
+  }
+  if (Attrs.empty())
+    HasAttrs = false;
+}
+
 const AttrVec &Decl::getAttrs() const {
   assert(HasAttrs && "No attrs to get!");
   return getASTContext().getDeclAttrs(this);
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index daf9f034ac..487390bc29 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2046,9 +2046,7 @@ void Sema::MergeVarDecl(VarDecl *New, LookupResult &Previous) {
     Diag(New->getLocation(), diag::warn_weak_import) << New->getDeclName();
     Diag(Old->getLocation(), diag::note_previous_definition);
     // Remove weak_import attribute on new declaration.
-    // I am just dropping all attributes in curernt decl. We have
-    // already issued a warning, so we are OK.
-    New->dropAttrs();
+    New->dropWeakImportAttr();
   }
 
   // Merge the types.