Remove weak_import attribute on new declaration.

// rdar://9538608

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133721 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index b5047b91c0e891f471edb3467293461595678caa..8d1ef8f06e569a21c4a86ffe6a74c5859b8bcd79 100644 (file)
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -363,6 +363,7 @@ public:
   const AttrVec &getAttrs() const;
   void swapAttrs(Decl *D);
   void dropAttrs();
+  void dropWeakImportAttr();
 
   void addAttr(Attr *A) {
     if (hasAttrs())

diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 1766d39c1405f0ecace7b4548f366ea91e7b2989..c183e61df851405c5eac25ccb0de5eee46f7f0f7 100644 (file)
--- 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 daf9f034ac906d769ff6dd52cb9112770c2dd77a..487390bc290f9e909ba812f54fa59690b2828dfb 100644 (file)
--- 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.