diff options
| -rw-r--r-- | clang/lib/Sema/SemaDeclAttr.cpp | 21 | ||||
| -rw-r--r-- | clang/test/CodeGen/pragma-weak.c | 9 | ||||
| -rw-r--r-- | clang/test/Sema/pragma-weak.c | 6 |
3 files changed, 28 insertions, 8 deletions
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index c00914663aa..13a11bcac9e 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -5435,17 +5435,22 @@ NamedDecl * Sema::DeclClonePragmaWeak(NamedDecl *ND, IdentifierInfo *II, assert(isa<FunctionDecl>(ND) || isa<VarDecl>(ND)); NamedDecl *NewD = nullptr; if (FunctionDecl *FD = dyn_cast<FunctionDecl>(ND)) { - FunctionDecl *NewFD; - // FIXME: Missing call to CheckFunctionDeclaration(). // FIXME: Mangling? // FIXME: Is the qualifier info correct? // FIXME: Is the DeclContext correct? - NewFD = FunctionDecl::Create(FD->getASTContext(), FD->getDeclContext(), - Loc, Loc, DeclarationName(II), - FD->getType(), FD->getTypeSourceInfo(), - SC_None, false/*isInlineSpecified*/, - FD->hasPrototype(), - false/*isConstexprSpecified*/); + + LookupResult Previous(*this, II, Loc, LookupOrdinaryName); + LookupParsedName(Previous, TUScope, nullptr, true); + + auto NewFD = FunctionDecl::Create( + FD->getASTContext(), FD->getDeclContext(), Loc, Loc, + DeclarationName(II), FD->getType(), FD->getTypeSourceInfo(), SC_None, + false /*isInlineSpecified*/, FD->hasPrototype(), + false /*isConstexprSpecified*/); + + CheckFunctionDeclaration(TUScope, NewFD, Previous, + false /*IsExplicitSpecialization*/); + NewD = NewFD; if (FD->getQualifier()) diff --git a/clang/test/CodeGen/pragma-weak.c b/clang/test/CodeGen/pragma-weak.c index 36abca5de32..e63277fc230 100644 --- a/clang/test/CodeGen/pragma-weak.c +++ b/clang/test/CodeGen/pragma-weak.c @@ -17,6 +17,7 @@ // CHECK-DAG: @mix2 = weak alias void (), void ()* @__mix2 // CHECK-DAG: @a1 = weak alias void (), void ()* @__a1 // CHECK-DAG: @xxx = weak alias void (), void ()* @__xxx +// CHECK-DAG: @weakfoo = weak alias void {{.*}} @localfoo @@ -173,6 +174,14 @@ label: // CHECK: declare extern_weak i32 @PR16705b() // CHECK: declare extern_weak i32 @PR16705c() +// In this test case, we have a declaration of weakfoo before #pragma weak. +// Test that 2 decls for the weakfoo are merged. +extern void weakfoo(); +void localfoo() { } +#pragma weak weakfoo=localfoo +extern void externmain() { return weakfoo(); } +// CHECK-LABEL: define void @externmain() +// CHECK: call{{.*}}@weakfoo ///////////// TODO: stuff that still doesn't work diff --git a/clang/test/Sema/pragma-weak.c b/clang/test/Sema/pragma-weak.c index c14125eac9f..031e78f15ff 100644 --- a/clang/test/Sema/pragma-weak.c +++ b/clang/test/Sema/pragma-weak.c @@ -9,3 +9,9 @@ void __a3(void) __attribute((noinline)); #pragma weak a3 = __a3 // expected-note {{previous definition}} void a3(void) __attribute((alias("__a3"))); // expected-error {{redefinition of 'a3'}} void __a3(void) {} + +extern void weak2foo(int); // expected-note {{previous declaration is here}} expected-note {{'weak2foo' declared here}} +void local2foo(double d1, double d2) { } +#pragma weak weak2foo=local2foo // expected-error {{conflicting types for 'weak2foo'}} +extern void extern2main() { return weak2foo(); } // expected-error {{too few arguments to function call, expected 1, have 0}} + |
