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

Eliminate the Parameter type completely - now ParameterList is just

Browse Source 
an overblown array of ParamDecl*'s that also keeps track of parenlocs
and has helper methods.
This commit is contained in:
Chris Lattner
2016-01-03 14:44:48 -08:00
parent a503269e2d
commit 6afe77d597
43 changed files with 362 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Serialization/Deserialization.cpp
View File

@@ -285,7 +285,7 @@ ParameterList *ModuleFile::readParameterList() {
unsigned numParams;
decls_block::ParameterListLayout::readRecord(scratch, numParams);
SmallVector<Parameter, 8> params;
SmallVector<ParamDecl*, 8> params;
for (unsigned i = 0; i != numParams; ++i) {
scratch.clear();
auto entry = DeclTypeCursor.advance(AF_DontPopBlockAtEnd);
@@ -300,15 +300,14 @@ ParameterList *ModuleFile::readParameterList() {
isVariadic, rawDefaultArg);
Parameter result;
result.decl = cast<ParamDecl>(getDecl(paramID));
result.setVariadic(isVariadic);
auto decl = cast<ParamDecl>(getDecl(paramID));
decl->setVariadic(isVariadic);
// Decode the default argument kind.
// FIXME: Default argument expression, if available.
if (auto defaultArg = getActualDefaultArgKind(rawDefaultArg))
result.decl->setDefaultArgumentKind(*defaultArg);
params.push_back(result);
decl->setDefaultArgumentKind(*defaultArg);
params.push_back(decl);
}
return ParameterList::create(getContext(), params);
@@ -2281,7 +2280,7 @@ Decl *ModuleFile::getDecl(DeclID DID, Optional<DeclContext *> ForcedContext) {
auto *bodyParams0 = readParameterList();
auto *bodyParams1 = readParameterList();
assert(bodyParams0 && bodyParams1 && "missing parameters for constructor");
ctor->setParameterLists(bodyParams0->get(0).decl, bodyParams1);
ctor->setParameterLists(bodyParams0->get(0), bodyParams1);
// This must be set after recording the constructor in the map.
// A polymorphic constructor type needs to refer to the constructor to get
@@ -3097,7 +3096,7 @@ Decl *ModuleFile::getDecl(DeclID DID, Optional<DeclContext *> ForcedContext) {
dtor->setAccessibility(cast<ClassDecl>(DC)->getFormalAccess());
auto *selfParams = readParameterList();
assert(selfParams && "Didn't get self pattern?");
dtor->setSelfDecl(selfParams->get(0).decl);
dtor->setSelfDecl(selfParams->get(0));
dtor->setType(getType(signatureID));
dtor->setInterfaceType(getType(interfaceID));