llvm.org GIT mirror llvm / 2c87dd9
Merge from mainline. Properly handle linking of strong alias with weak function, this fixes PR2883 git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_24@57707 91177308-0d34-0410-b5e6-96231b3b80d8 Tanya Lattner 10 years ago
1 changed file(s) with 1 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
983983 // The only valid mappings are:
984984 // - SF is external declaration, which is effectively a no-op.
985985 // - SF is weak, when we just need to throw SF out.
986 if (!SF->isDeclaration())
986 if (!SF->isDeclaration() && !SF->mayBeOverridden())
987987 return Error(Err, "Function-Alias Collision on '" + SF->getName() +
988988 "': symbol multiple defined");
989989 }