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

Trivial updates for upstream LLVM changes.

Browse Source 
- BitRig is gone
- llvm::enumerate's element type now uses methods instead of fields

No intended functionality change.
This commit is contained in:
Jordan Rose
2017-07-25 14:11:03 -07:00
parent 1c1597c70e
commit 63a9943a46
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Basic/Platform.cpp
View File

@@ -102,7 +102,6 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
case llvm::Triple::RTEMS: case llvm::Triple::RTEMS:
case llvm::Triple::NaCl: case llvm::Triple::NaCl:
case llvm::Triple::CNK: case llvm::Triple::CNK:
case llvm::Triple::Bitrig:
case llvm::Triple::AIX: case llvm::Triple::AIX:
case llvm::Triple::CUDA: case llvm::Triple::CUDA:
case llvm::Triple::NVCL: case llvm::Triple::NVCL:

4
lib/SILOptimizer/Analysis/MemoryBehavior.cpp
View File

@@ -243,8 +243,8 @@ MemBehavior MemoryBehaviorVisitor::visitApplyInst(ApplyInst *AI) {
// We can ignore mayTrap(). // We can ignore mayTrap().
bool any_in_guaranteed_params = false; bool any_in_guaranteed_params = false;
for (auto op : enumerate(AI->getArgumentOperands())) { for (auto op : enumerate(AI->getArgumentOperands())) {
if (op.Value.get() == V && if (op.value().get() == V &&
AI->getSubstCalleeConv().getSILArgumentConvention(op.Index) == swift::SILArgumentConvention::Indirect_In_Guaranteed) { AI->getSubstCalleeConv().getSILArgumentConvention(op.index()) == swift::SILArgumentConvention::Indirect_In_Guaranteed) {
any_in_guaranteed_params = true; any_in_guaranteed_params = true;
break; break;
} }