averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[stable-merge] Adopt new setUnnamedAddr API

Browse Source
This commit is contained in:
Vedant Kumar
2016-06-27 11:12:28 -07:00
parent 4a7ba9c580
commit 1409a445d9
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/IRGen/GenDecl.cpp
View File

@@ -1743,7 +1743,7 @@ static llvm::GlobalVariable *createGOTEquivalent(IRGenModule &IGM,
llvm::GlobalValue::PrivateLinkage, llvm::GlobalValue::PrivateLinkage,
global, global,
llvm::Twine("got.") + globalName); llvm::Twine("got.") + globalName);
gotEquivalent->setUnnamedAddr(true); gotEquivalent->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
return gotEquivalent; return gotEquivalent;
} }
@@ -2875,7 +2875,7 @@ llvm::Constant *IRGenModule::getAddrOfGlobalString(StringRef data,
// FIXME: Clear unnamed_addr if the global will be relative referenced // FIXME: Clear unnamed_addr if the global will be relative referenced
// to work around an ld64 bug. rdar://problem/22674524 // to work around an ld64 bug. rdar://problem/22674524
if (willBeRelativelyAddressed) if (willBeRelativelyAddressed)
entry.first->setUnnamedAddr(false); entry.first->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::None);
return entry.second; return entry.second;
} }
@@ -2911,7 +2911,7 @@ llvm::Constant *IRGenModule::getAddrOfGlobalUTF16String(StringRef utf8) {
auto global = new llvm::GlobalVariable(Module, init->getType(), true, auto global = new llvm::GlobalVariable(Module, init->getType(), true,
llvm::GlobalValue::PrivateLinkage, llvm::GlobalValue::PrivateLinkage,
init); init);
global->setUnnamedAddr(true); global->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
// Drill down to make an i16*. // Drill down to make an i16*.
auto zero = llvm::ConstantInt::get(SizeTy, 0); auto zero = llvm::ConstantInt::get(SizeTy, 0);

2
lib/IRGen/GenObjC.cpp
View File

@@ -980,7 +980,7 @@ static llvm::Constant *findSwiftAsObjCThunk(IRGenModule &IGM, SILDeclRef ref) {
auto fn = IGM.getAddrOfSILFunction(SILFn, NotForDefinition); auto fn = IGM.getAddrOfSILFunction(SILFn, NotForDefinition);
fn->setVisibility(llvm::GlobalValue::DefaultVisibility); fn->setVisibility(llvm::GlobalValue::DefaultVisibility);
fn->setLinkage(llvm::GlobalValue::InternalLinkage); fn->setLinkage(llvm::GlobalValue::InternalLinkage);
fn->setUnnamedAddr(true); fn->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
return llvm::ConstantExpr::getBitCast(fn, IGM.Int8PtrTy); return llvm::ConstantExpr::getBitCast(fn, IGM.Int8PtrTy);
} }

2
lib/IRGen/IRGenModule.cpp
View File

@@ -622,7 +622,7 @@ IRGenModule::createStringConstant(StringRef Str,
// unnamed_addr to prevent it from going into the cstrings section and getting // unnamed_addr to prevent it from going into the cstrings section and getting
// coalesced. // coalesced.
if (!willBeRelativelyAddressed) if (!willBeRelativelyAddressed)
global->setUnnamedAddr(true); global->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
if (!sectionName.empty()) if (!sectionName.empty())
global->setSection(sectionName); global->setSection(sectionName);

2
lib/Immediate/REPL.cpp
View File

@@ -772,7 +772,7 @@ private:
for (auto &global : M.globals()) { for (auto &global : M.globals()) {
if (!global.hasName()) if (!global.hasName())
continue; continue;
if (global.hasUnnamedAddr()) if (global.hasGlobalUnnamedAddr())
continue; continue;
global.setVisibility(llvm::GlobalValue::DefaultVisibility); global.setVisibility(llvm::GlobalValue::DefaultVisibility);