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

[NFC] Use ClangTypeInfo's implicit null state instead of an extra Optional.

Browse Source
This commit is contained in:
Varun Gandhi
2020-08-18 16:09:32 -07:00
parent eaac23fdd4
commit 8da4d53d2c
4 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/AST/ASTContext.cpp
View File

@@ -3131,16 +3131,16 @@ FunctionType *FunctionType::get(ArrayRef<AnyFunctionType::Param> params,
return funcTy;
}
Optional<ClangTypeInfo> clangTypeInfo = info.getClangTypeInfo();
auto clangTypeInfo = info.getClangTypeInfo();
size_t allocSize = totalSizeToAlloc<AnyFunctionType::Param, ClangTypeInfo>(
params.size(), clangTypeInfo.hasValue() ? 1 : 0);
params.size(), clangTypeInfo.empty() ? 0 : 1);
void *mem = ctx.Allocate(allocSize, alignof(FunctionType), arena);
bool isCanonical = isFunctionTypeCanonical(params, result);
if (clangTypeInfo.hasValue()) {
if (!clangTypeInfo.empty()) {
if (ctx.LangOpts.UseClangFunctionTypes)
isCanonical &= clangTypeInfo->type->isCanonicalUnqualified();
isCanonical &= clangTypeInfo.getType()->isCanonicalUnqualified();
else
isCanonical = false;
}
@@ -3162,8 +3162,8 @@ FunctionType::FunctionType(ArrayRef<AnyFunctionType::Param> params,
std::uninitialized_copy(params.begin(), params.end(),
getTrailingObjects<AnyFunctionType::Param>());
auto clangTypeInfo = info.getClangTypeInfo();
if (clangTypeInfo.hasValue())
*getTrailingObjects<ClangTypeInfo>() = clangTypeInfo.getValue();
if (!clangTypeInfo.empty())
*getTrailingObjects<ClangTypeInfo>() = clangTypeInfo;
}
void GenericFunctionType::Profile(llvm::FoldingSetNodeID &ID,