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

Fold ExtInfo::isThin and ::isBlock into a "Representation" enum.

Browse Source 
These bits are orthogonal to each other, so combine them into one, and diagnose attempts to produce a type that's both. Spot-fix a bunch of places this revealed by inspection that we would have crashed in SILGen or IRGen if blocks were be handled.

Swift SVN r16088
This commit is contained in:
Joe Groff
2014-04-09 00:37:26 +00:00
parent e9d2e122ee
commit 8adaab0233
35 changed files with 505 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/IRGen/GenDecl.cpp
View File

@@ -176,7 +176,7 @@ public:
}
void visitVarDecl(VarDecl *prop) {
if (!requiresObjCPropertyDescriptor(prop)) return;
if (!requiresObjCPropertyDescriptor(IGF.IGM, prop)) return;
llvm::Constant *name, *imp, *types;
emitObjCGetterDescriptorParts(IGF.IGM, prop,
@@ -202,7 +202,7 @@ public:
}
void visitSubscriptDecl(SubscriptDecl *subscript) {
if (!requiresObjCSubscriptDescriptor(subscript)) return;
if (!requiresObjCSubscriptDescriptor(IGF.IGM, subscript)) return;
llvm::Constant *name, *imp, *types;
emitObjCGetterDescriptorParts(IGF.IGM, subscript,
@@ -307,8 +307,8 @@ void IRGenModule::emitSourceFile(SourceFile &SF, unsigned StartElem) {
SILResultInfo retTy(TupleType::getEmpty(Context),
ResultConvention::Unowned);
auto extInfo = SILFunctionType::ExtInfo(AbstractCC::Freestanding,
/*thin*/ true,
/*noreturn*/ false);
SILFunctionType::Representation::Thin,
/*noreturn*/ false);
auto fnTy = SILFunctionType::get(nullptr, extInfo,
ParameterConvention::Direct_Unowned,
paramTy, retTy,
@@ -1487,7 +1487,7 @@ void IRGenModule::emitExtension(ExtensionDecl *ext) {
}
if (auto var = dyn_cast<VarDecl>(member)) {
if (requiresObjCPropertyDescriptor(var)) {
if (requiresObjCPropertyDescriptor(*this, var)) {
needsCategory = true;
break;
}
@@ -1495,7 +1495,7 @@ void IRGenModule::emitExtension(ExtensionDecl *ext) {
}
if (auto subscript = dyn_cast<SubscriptDecl>(member)) {
if (requiresObjCSubscriptDescriptor(subscript)) {
if (requiresObjCSubscriptDescriptor(*this, subscript)) {
needsCategory = true;
break;
}