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

Revert "SILGen: Make witness parameter translation handle single-element tuples."

Browse Source 
This reverts commit r29561; JoeG says it was a mistake.

Swift SVN r29562
This commit is contained in:
Dave Abrahams
2015-06-23 00:57:08 +00:00
parent 87ba8f5123
commit 4d7feb72e0
3 changed files with 7 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/SIL/AbstractionPattern.cpp
View File

@@ -165,8 +165,7 @@ bool AbstractionPattern::matchesTuple(CanTupleType substType) {
case Kind::ClangType:
case Kind::Type:
auto tuple = dyn_cast<TupleType>(getType());
return tuple ? tuple->getNumElements() == substType->getNumElements()
: substType->getNumElements() == 1;
return (tuple && tuple->getNumElements() == substType->getNumElements());
}
llvm_unreachable("bad kind");
}
@@ -207,16 +206,6 @@ static bool isVoidLike(CanType type) {
AbstractionPattern
AbstractionPattern::getTupleElementType(unsigned index) const {
auto getElementType = [&]() -> CanType {
auto tuple = dyn_cast<TupleType>(getType());
if (tuple) {
return tuple.getElementType(index);
} else {
assert(index == 0);
return getType();
}
};
switch (getKind()) {
case Kind::Invalid:
llvm_unreachable("querying invalid abstraction pattern!");
@@ -231,14 +220,14 @@ AbstractionPattern::getTupleElementType(unsigned index) const {
return OrigTupleElements[index];
case Kind::ClangType:
return AbstractionPattern(getGenericSignature(),
getElementType(),
cast<TupleType>(getType()).getElementType(index),
getClangArrayElementType(getClangType(), index));
case Kind::Type:
return AbstractionPattern(getGenericSignature(),
getElementType());
cast<TupleType>(getType()).getElementType(index));
case Kind::ClangFunctionParamTupleType:
return AbstractionPattern(getGenericSignature(),
getElementType(),
cast<TupleType>(getType()).getElementType(index),
getClangFunctionParameterType(getClangType(), index));
case Kind::ObjCMethodFormalParamTupleType: {