diff options
| author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2014-05-20 19:00:58 +0000 |
|---|---|---|
| committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2014-05-20 19:00:58 +0000 |
| commit | 8598e290c3ef00108d1e59871f7c2665be44273a (patch) | |
| tree | fa119d32e300177ff4e8a772f36c4ec1d524bb65 /include | |
| parent | 1e3493b04a88fe931f73eebc175eb03c0d165e21 (diff) | |
| download | llvm-8598e290c3ef00108d1e59871f7c2665be44273a.tar.gz llvm-8598e290c3ef00108d1e59871f7c2665be44273a.tar.bz2 llvm-8598e290c3ef00108d1e59871f7c2665be44273a.tar.xz | |
GlobalValue: Automatically reset visibility when setting local linkage
r208264 started asserting in `setLinkage()` and `setVisibility()` that
visibility and linkage are compatible. There are a few places in clang
where visibility is set first, and then linkage later, so the assert
fires. In `setLinkage()`, it's clear what the visibility *should* be,
so rather than updating all the call sites just automatically fix the
visibility.
The testcase for this is for *clang*, so it'll follow separately in cfe.
PR19760
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209227 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/IR/GlobalValue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/IR/GlobalValue.h b/include/llvm/IR/GlobalValue.h index 0ed302cdb4..10df372945 100644 --- a/include/llvm/IR/GlobalValue.h +++ b/include/llvm/IR/GlobalValue.h @@ -222,8 +222,8 @@ public: bool hasCommonLinkage() const { return isCommonLinkage(Linkage); } void setLinkage(LinkageTypes LT) { - assert((!isLocalLinkage(LT) || hasDefaultVisibility()) && - "local linkage requires default visibility"); + if (isLocalLinkage(LT)) + Visibility = DefaultVisibility; Linkage = LT; } LinkageTypes getLinkage() const { return Linkage; } |