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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Greg Parker
2017-06-28 15:25:17 -07:00
parent aff8d06b6a 5d8fa8f10e
commit 7b009eccde
629 changed files with 21576 additions and 10961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/Builtins.cpp
View File

@@ -1028,7 +1028,7 @@ static ValueDecl *getCheckedTruncOperation(ASTContext &Context,
return nullptr;
Type OverflowBitTy = BuiltinIntegerType::get(1, Context);
TupleTypeElt ResultElts[] = { OutTy, OverflowBitTy };
TupleTypeElt ResultElts[] = { Type(OutTy), OverflowBitTy };
Type ResultTy = TupleType::get(ResultElts, Context);
return getBuiltinFunction(Id, { InTy }, ResultTy);
}
@@ -1036,7 +1036,7 @@ static ValueDecl *getCheckedTruncOperation(ASTContext &Context,
static ValueDecl *getCheckedConversionOperation(ASTContext &Context,
Identifier Id,
Type Ty) {
auto BuiltinTy = Ty->getAs<BuiltinIntegerType>();
Type BuiltinTy = Ty->getAs<BuiltinIntegerType>();
if (!BuiltinTy)
return nullptr;