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

Track uptstream LLVM API change: llvm::tie() was removed, use std::tie() instead

Browse Source 
Swift SVN r14573
This commit is contained in:
Dmitri Hrybenko
2014-03-02 13:53:19 +00:00
parent be7759b149
commit ba6548b072
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/IRGen/GenDecl.cpp
View File

@@ -646,7 +646,7 @@ LinkInfo LinkInfo::get(IRGenModule &IGM, const LinkEntity &entity,
entity.mangle(result.Name);
llvm::tie(result.Linkage, result.Visibility) =
std::tie(result.Linkage, result.Visibility) =
getIRLinkage(IGM, entity.getLinkage(isDefinition), isDefinition);
return result;

2
lib/SILGen/SILGenDecl.cpp
View File

@@ -1599,7 +1599,7 @@ void SILGenFunction::emitObjCDestructor(SILDeclRef dtor) {
Optional<SILValue> maybeReturnValue;
SILLocation returnLoc(loc);
llvm::tie(maybeReturnValue, returnLoc) = emitEpilogBB(loc);
std::tie(maybeReturnValue, returnLoc) = emitEpilogBB(loc);
if (!maybeReturnValue)
return;

8
lib/SILGen/SILGenExpr.cpp
View File

@@ -2004,7 +2004,7 @@ void SILGenFunction::emitEpilog(SILLocation TopLevel, bool AutoGen) {
if (AutoGen)
TopLevel.markAutoGenerated();
llvm::tie(maybeReturnValue, returnLoc) = emitEpilogBB(TopLevel);
std::tie(maybeReturnValue, returnLoc) = emitEpilogBB(TopLevel);
// If the epilog is unreachable, we're done.
if (!maybeReturnValue)
@@ -2039,7 +2039,7 @@ void SILGenFunction::emitDestroyingDestructor(DestructorDecl *dd) {
Optional<SILValue> maybeReturnValue;
SILLocation returnLoc(Loc);
llvm::tie(maybeReturnValue, returnLoc) = emitEpilogBB(Loc);
std::tie(maybeReturnValue, returnLoc) = emitEpilogBB(Loc);
if (!maybeReturnValue)
return;
@@ -2292,7 +2292,7 @@ void SILGenFunction::emitValueConstructor(ConstructorDecl *ctor) {
Optional<SILValue> maybeReturnValue;
SILLocation returnLoc(ctor);
llvm::tie(maybeReturnValue, returnLoc) = emitEpilogBB(ctor);
std::tie(maybeReturnValue, returnLoc) = emitEpilogBB(ctor);
// Return 'self' in the epilog.
if (!maybeReturnValue)
@@ -2738,7 +2738,7 @@ void SILGenFunction::emitClassConstructorInitializer(ConstructorDecl *ctor) {
// Return 'self' in the epilog.
Optional<SILValue> maybeReturnValue;
SILLocation returnLoc(ctor);
llvm::tie(maybeReturnValue, returnLoc) = emitEpilogBB(ctor);
std::tie(maybeReturnValue, returnLoc) = emitEpilogBB(ctor);
if (!maybeReturnValue)
return;

4
lib/SILPasses/ConstantPropagation.cpp
View File

@@ -514,7 +514,7 @@ constantFoldAndCheckIntegerConversions(ApplyInst *AI,
// Otherwise, print the Builtin Types.
} else {
bool SrcTySigned, DstTySigned;
llvm::tie(SrcTySigned, DstTySigned) = getTypeSigndness(Builtin);
std::tie(SrcTySigned, DstTySigned) = getTypeSigndness(Builtin);
diagnose(M.getASTContext(), Loc.getSourceLoc(),
diag::integer_literal_overflow_builtin_types,
DstTySigned, DstTy);
@@ -536,7 +536,7 @@ constantFoldAndCheckIntegerConversions(ApplyInst *AI,
// Since builtin types are sign-agnostic, print the signdness
// separately.
bool SrcTySigned, DstTySigned;
llvm::tie(SrcTySigned, DstTySigned) = getTypeSigndness(Builtin);
std::tie(SrcTySigned, DstTySigned) = getTypeSigndness(Builtin);
diagnose(M.getASTContext(), Loc.getSourceLoc(),
diag::integer_conversion_overflow_builtin_types,
SrcTySigned, SrcTy, DstTySigned, DstTy);

4
lib/SILPasses/DeadCodeElimination.cpp
View File

@@ -250,7 +250,7 @@ static bool constantFoldTerminator(SILBasicBlock &BB,
for (unsigned Idx = 0; Idx < SUI->getNumCases(); ++Idx) {
const EnumElementDecl *EI;
SILBasicBlock *BI;
llvm::tie(EI, BI) = SUI->getCase(Idx);
std::tie(EI, BI) = SUI->getCase(Idx);
if (EI == TheEnumElem) {
TheSuccessorBlock = BI;
ReachableBlockIdx = Idx;
@@ -334,7 +334,7 @@ static bool constantFoldTerminator(SILBasicBlock &BB,
for (unsigned Idx = 0; Idx < SUI->getNumCases(); ++Idx) {
APInt EI;
SILBasicBlock *BI;
llvm::tie(EI, BI) = SUI->getCase(Idx);
std::tie(EI, BI) = SUI->getCase(Idx);
if (EI == SwitchVal->getValue())
TheSuccessorBlock = BI;
}

6
lib/Serialization/ModuleFile.cpp
View File

@@ -142,7 +142,7 @@ SerializedModuleLoader::validateSerializedAST(StringRef data) {
while (topLevelEntry.Kind == llvm::BitstreamEntry::SubBlock) {
if (topLevelEntry.ID == CONTROL_BLOCK_ID) {
cursor.EnterSubBlock(CONTROL_BLOCK_ID);
llvm::tie(result.status, result.name) =
std::tie(result.status, result.name) =
validateControlBlock(cursor, scratch);
if (result.status == ModuleStatus::Malformed)
return result;
@@ -587,7 +587,7 @@ bool ModuleFile::associateWithFileContext(FileUnit *file) {
assert(!dependency.isLoaded() && "already loaded?");
StringRef modulePath, scopePath;
llvm::tie(modulePath, scopePath) = dependency.RawAccessPath.split('\0');
std::tie(modulePath, scopePath) = dependency.RawAccessPath.split('\0');
auto moduleID = ctx.getIdentifier(modulePath);
assert(!moduleID.empty() &&
@@ -693,7 +693,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
ASTContext &Ctx = getContext();
for (auto &Dep : Dependencies) {
StringRef ModulePath, ScopePath;
llvm::tie(ModulePath, ScopePath) = Dep.RawAccessPath.split('\0');
std::tie(ModulePath, ScopePath) = Dep.RawAccessPath.split('\0');
auto ModuleID = Ctx.getIdentifier(ModulePath);
assert(!ModuleID.empty() &&