diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-01-16 23:11:15 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-01-16 23:11:15 +0000 |
| commit | 2a5bb509e2d33a0f7aa4bb0ba53c73b5dfdd6bb4 (patch) | |
| tree | 7c6012abbb1658a5d441bb07d58a7502fc6f7805 /lib/Sema/SemaDeclAttr.cpp | |
| parent | 4f918aed75d4927e88365541c7200f0b5fe5014b (diff) | |
Check for internal weak decls after merging.
This fixes pr14946. The problem was that the linkage computation was done too
early, so things like "extern int a;" would be given external linkage, even if
a previous declaration was static.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172667 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclAttr.cpp')
| -rw-r--r-- | lib/Sema/SemaDeclAttr.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index 85f48ecff3..efeafa697f 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -2511,12 +2511,6 @@ static void handleWeakAttr(Sema &S, Decl *D, const AttributeList &Attr) { NamedDecl *nd = cast<NamedDecl>(D); - // 'weak' only applies to declarations with external linkage. - if (hasEffectivelyInternalLinkage(nd)) { - S.Diag(Attr.getLoc(), diag::err_attribute_weak_static); - return; - } - nd->addAttr(::new (S.Context) WeakAttr(Attr.getRange(), S.Context)); } |