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 r21291; it's breaking the standard library build.

Browse Source 
Swift SVN r21292
This commit is contained in:
Doug Gregor
2014-08-19 20:37:05 +00:00
parent e6f051fcd2
commit c06e22d406
9 changed files with 17 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/AST/Verifier.cpp
View File

@@ -1537,32 +1537,6 @@ struct ASTNodeBase {};
"should be marked invalid";
abort();
}
// Verify that the optionality of the result type of the
// initializer matches the failability of the initializer.
if (!CD->isInvalid()) {
OptionalTypeKind resultOptionality = OTK_None;
CD->getResultType()->getAnyOptionalObjectType(resultOptionality);
if (resultOptionality != CD->getFailability()) {
Out << "Initializer has result optionality/failability mismatch\n";
CD->dump(llvm::errs());
abort();
}
// Also check the interface type.
if (auto genericFn
= CD->getInterfaceType()->getAs<GenericFunctionType>()) {
resultOptionality = OTK_None;
genericFn->getResult()->castTo<AnyFunctionType>()->getResult()
->getAnyOptionalObjectType(resultOptionality);
if (resultOptionality != CD->getFailability()) {
Out << "Initializer has result optionality/failability mismatch\n";
CD->dump(llvm::errs());
abort();
}
}
}
verifyCheckedBase(CD);
}