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

More fixes for FinalAttr.

Browse Source 
Swift SVN r15902
This commit is contained in:
Doug Gregor
2014-04-03 22:57:16 +00:00
parent 6b71d48a97
commit d07d0b8366
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/Deserialization.cpp
View File

@@ -1683,7 +1683,7 @@ Decl *ModuleFile::getDecl(DeclID DID, Optional<DeclContext *> ForcedContext,
if (isOptional)
var->getMutableAttrs().setAttr(AK_optional, SourceLoc());
if (isFinal)
var->getMutableAttrs().add(DeclAttribute::createFinal(ctx));
var->getMutableAttrs().add(new (ctx) FinalAttr());
if (auto overridden = cast_or_null<VarDecl>(getDecl(overriddenID))) {
var->setOverriddenDecl(overridden);
@@ -1842,7 +1842,7 @@ Decl *ModuleFile::getDecl(DeclID DID, Optional<DeclContext *> ForcedContext,
if (isOptional)
fn->getMutableAttrs().setAttr(AK_optional, SourceLoc());
if (isFinal)
fn->getMutableAttrs().add(DeclAttribute::createFinal(ctx));
fn->getMutableAttrs().add(new (ctx) FinalAttr());
// If we are an accessor on a var or subscript, make sure it is deserialized
// too.
getDecl(accessorStorageDeclID);
@@ -2199,7 +2199,7 @@ Decl *ModuleFile::getDecl(DeclID DID, Optional<DeclContext *> ForcedContext,
if (isOptional)
subscript->getMutableAttrs().setAttr(AK_optional, SourceLoc());
if (isFinal)
subscript->getMutableAttrs().add(DeclAttribute::createFinal(ctx));
subscript->getMutableAttrs().add(new (ctx) FinalAttr());
if (auto overridden = cast_or_null<SubscriptDecl>(getDecl(overriddenID))) {
subscript->setOverriddenDecl(overridden);
subscript->getMutableAttrs().setAttr(AK_override, SourceLoc());