diff options
| -rw-r--r-- | clang/lib/Sema/Sema.cpp | 11 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CodeGen/pragma-weak.c | 6 |
3 files changed, 14 insertions, 5 deletions
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp index cc509566bdd..300e2f040a2 100644 --- a/clang/lib/Sema/Sema.cpp +++ b/clang/lib/Sema/Sema.cpp @@ -727,8 +727,15 @@ void Sema::ActOnEndOfTranslationUnit() { if (WeakID.second.getUsed()) continue; - Diag(WeakID.second.getLocation(), diag::warn_weak_identifier_undeclared) - << WeakID.first; + Decl *PrevDecl = LookupSingleName(TUScope, WeakID.first, SourceLocation(), + LookupOrdinaryName); + if (PrevDecl != nullptr && + !(isa<FunctionDecl>(PrevDecl) || isa<VarDecl>(PrevDecl))) + Diag(WeakID.second.getLocation(), diag::warn_attribute_wrong_decl_type) + << "'weak'" << ExpectedVariableOrFunction; + else + Diag(WeakID.second.getLocation(), diag::warn_weak_identifier_undeclared) + << WeakID.first; } if (LangOpts.CPlusPlus11 && diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 2ed4a61aaba..701d8c72902 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -14530,7 +14530,7 @@ void Sema::ActOnPragmaWeakAlias(IdentifierInfo* Name, LookupOrdinaryName); WeakInfo W = WeakInfo(Name, NameLoc); - if (PrevDecl) { + if (PrevDecl && (isa<FunctionDecl>(PrevDecl) || isa<VarDecl>(PrevDecl))) { if (!PrevDecl->hasAttr<AliasAttr>()) if (NamedDecl *ND = dyn_cast<NamedDecl>(PrevDecl)) DeclApplyPragmaWeak(TUScope, ND, W); diff --git a/clang/test/CodeGen/pragma-weak.c b/clang/test/CodeGen/pragma-weak.c index 063dec30ac5..36abca5de32 100644 --- a/clang/test/CodeGen/pragma-weak.c +++ b/clang/test/CodeGen/pragma-weak.c @@ -53,12 +53,14 @@ void __foo2(void) {} #pragma weak unused // expected-warning {{weak identifier 'unused' never declared}} #pragma weak unused_alias = __unused_alias // expected-warning {{weak identifier '__unused_alias' never declared}} -#pragma weak td // expected-warning {{weak identifier 'td' never declared}} +#pragma weak td // expected-warning {{'weak' attribute only applies to variables and functions}} typedef int td; -#pragma weak td2 = __td2 // expected-warning {{weak identifier '__td2' never declared}} +#pragma weak td2 = __td2 // expected-warning {{'weak' attribute only applies to variables and functions}} typedef int __td2; +typedef int __td3; +#pragma weak td3 = __td3 // expected-warning {{'weak' attribute only applies to variables and functions}} ///// test weird cases |
