This is an archive of the discontinued LLVM Phabricator instance.

Differential D19267

ModuleLinker: Do not import linkonce/weak as "external_weak"
ClosedPublic

Authored by mehdi_amini on Apr 19 2016, 8:49 AM.

Details

Reviewers
• rafael
mehdi_amini
Commits
rG113adde594a0: ModuleLinker: Do not import linkonce/weak as "external_weak"
Summary

There is no reason to have a weak reference because the external
definition will be weak.

Diff Detail

Event Timeline

mehdi_amini updated this revision to Diff 54203.Apr 19 2016, 8:49 AM
mehdi_amini retitled this revision from to ModuleLinker: Do not import linkonce/weak as "external_weak".
mehdi_amini updated this object.
mehdi_amini added a reviewer: • rafael.
mehdi_amini added subscribers: tejohnson, llvm-commits.
• rafael edited edge metadata.Apr 19 2016, 9:08 AM
• rafael added a subscriber: • rafael.

LGTM

mehdi_amini accepted this revision.Apr 19 2016, 9:17 AM
mehdi_amini added a reviewer: mehdi_amini.

(approved by Rafael on the mailing list)

This revision is now accepted and ready to land.Apr 19 2016, 9:17 AM
mehdi_amini closed this revision.Apr 19 2016, 9:17 AM

r266750

Revision Contents

PathSize
lib/
Linker/
3 lines
test/
Linker/
4 lines

Diff 54203

lib/Linker/IRMover.cpp

Show First 20 Lines • Show All 611 Lines • ▼ Show 20 Lines else
/*isConstant*/ false, GlobalValue::ExternalLinkage, /*isConstant*/ false, GlobalValue::ExternalLinkage,
/*init*/ nullptr, SGV->getName(), /*init*/ nullptr, SGV->getName(),
/*insertbefore*/ nullptr, SGV->getThreadLocalMode(), /*insertbefore*/ nullptr, SGV->getThreadLocalMode(),
SGV->getType()->getAddressSpace()); SGV->getType()->getAddressSpace());
} }
if (ForDefinition) if (ForDefinition)
NewGV->setLinkage(SGV->getLinkage()); NewGV->setLinkage(SGV->getLinkage());
else if (SGV->hasExternalWeakLinkage() || SGV->hasWeakLinkage() || else if (SGV->hasExternalWeakLinkage())
SGV->hasLinkOnceLinkage())
NewGV->setLinkage(GlobalValue::ExternalWeakLinkage); NewGV->setLinkage(GlobalValue::ExternalWeakLinkage);
NewGV->copyAttributesFrom(SGV); NewGV->copyAttributesFrom(SGV);
// Remove these copied constants in case this stays a declaration, since // Remove these copied constants in case this stays a declaration, since
// they point to the source module. If the def is linked the values will // they point to the source module. If the def is linked the values will
// be mapped in during linkFunctionBody. // be mapped in during linkFunctionBody.
if (auto *NewF = dyn_cast<Function>(NewGV)) { if (auto *NewF = dyn_cast<Function>(NewGV)) {
▲ Show 20 Lines • Show All 738 Lines • Show Last 20 Lines

test/Linker/comdat14.ll

; RUN: llvm-link -S %s %p/Inputs/comdat14.ll -o - | FileCheck %s ; RUN: llvm-link -S %s %p/Inputs/comdat14.ll -o - | FileCheck %s
$c = comdat any $c = comdat any
@v = global i32 0, comdat ($c) @v = global i32 0, comdat ($c)
; CHECK: @v = global i32 0, comdat($c) ; CHECK: @v = global i32 0, comdat($c)
; CHECK: @v2 = extern_weak dllexport global i32 ; CHECK: @v2 = external dllexport global i32
; CHECK: @v3 = extern_weak global i32 ; CHECK: @v3 = external global i32