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

Merge pull request #16655 from davezarzycki/formalize_DeclIsBeingValidatedRAII

Browse Source 
[AST] NFC: Formalize Decl validation tracking via RAII
This commit is contained in:
Slava Pestov
2018-07-17 14:07:53 -07:00
committed by GitHub
parent 71656c72af b29d2784ed
commit 8d6a55fedb
14 changed files with 173 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/DerivedConformanceEquatableHashable.cpp
View File

@@ -675,7 +675,7 @@ deriveEquatable_eq(DerivedConformance &derived, Identifier generatedIdentifier,
}
eqDecl->setInterfaceType(interfaceTy);
eqDecl->copyFormalAccessFrom(derived.Nominal, /*sourceIsParentContext*/ true);
eqDecl->setValidationStarted();
eqDecl->setValidationToChecked();
C.addSynthesizedDecl(eqDecl);
@@ -809,7 +809,7 @@ deriveHashable_hashInto(DerivedConformance &derived,
}
hashDecl->setInterfaceType(interfaceType);
hashDecl->copyFormalAccessFrom(derived.Nominal);
hashDecl->setValidationStarted();
hashDecl->setValidationToChecked();
C.addSynthesizedDecl(hashDecl);
@@ -1132,14 +1132,14 @@ static ValueDecl *deriveHashable_hashValue(DerivedConformance &derived) {
AnyFunctionType::ExtInfo());
getterDecl->setInterfaceType(interfaceType);
getterDecl->setValidationStarted();
getterDecl->setValidationToChecked();
getterDecl->copyFormalAccessFrom(derived.Nominal,
/*sourceIsParentContext*/ true);
// Finish creating the property.
hashValueDecl->setImplicit();
hashValueDecl->setInterfaceType(intType);
hashValueDecl->setValidationStarted();
hashValueDecl->setValidationToChecked();
hashValueDecl->setAccessors(StorageImplInfo::getImmutableComputed(),
SourceLoc(), {getterDecl}, SourceLoc());
hashValueDecl->copyFormalAccessFrom(derived.Nominal,