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

Doug twisted my arm and convinced me that noescape was a better match for the semantics we’ll have here. NoCapture would be confusable with "this closure doesn’t have any captures, thus should be compatible with thin function types"

Browse Source 
The attribute itself remains __'ized.



Swift SVN r24113
This commit is contained in:
Chris Lattner
2014-12-23 17:52:10 +00:00
parent 5cffa73bbd
commit 21a7a6c89a
13 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/Deserialization.cpp
View File

@@ -2988,14 +2988,14 @@ Type ModuleFile::getType(TypeID TID) {
TypeID inputID;
TypeID resultID;
uint8_t rawCallingConvention;
bool autoClosure, thin, noreturn, blockCompatible, nocapture;
bool autoClosure, thin, noreturn, blockCompatible, noescape;
decls_block::FunctionTypeLayout::readRecord(scratch, inputID, resultID,
rawCallingConvention,
autoClosure, thin,
noreturn,
blockCompatible,
nocapture);
noescape);
auto callingConvention = getActualCC(rawCallingConvention);
if (!callingConvention.hasValue()) {
error();
@@ -3004,7 +3004,7 @@ Type ModuleFile::getType(TypeID TID) {
auto Info = FunctionType::ExtInfo(callingConvention.getValue(),
getFunctionRepresentation(thin, blockCompatible),
noreturn, autoClosure, nocapture);
noreturn, autoClosure, noescape);
typeOrOffset = FunctionType::get(getType(inputID), getType(resultID),
Info);