averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sema: Replace some calls to getDeclaredType() with getDeclaredInterfaceType()

Browse Source
This commit is contained in:
Slava Pestov
2020-07-31 13:10:49 -04:00
parent 94c6bff65d
commit 45fc0bc4db
22 changed files with 117 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Sema/DerivedConformanceCodingKey.cpp
View File

@@ -78,7 +78,7 @@ deriveRawValueInit(AbstractFunctionDecl *initDecl, void *) {
auto *rawValueDecl = new (C) ParamDecl(
SourceLoc(), SourceLoc(), C.Id_rawValue,
SourceLoc(), C.Id_rawValue, parentDC);
rawValueDecl->setInterfaceType(C.getIntDecl()->getDeclaredType());
rawValueDecl->setInterfaceType(C.getIntDecl()->getDeclaredInterfaceType());
rawValueDecl->setSpecifier(ParamSpecifier::Default);
rawValueDecl->setImplicit();
auto *paramList = ParameterList::createWithoutLoc(rawValueDecl);
@@ -362,7 +362,7 @@ ValueDecl *DerivedConformance::deriveCodingKey(ValueDecl *requirement) {
auto name = requirement->getBaseName();
if (name == Context.Id_stringValue) {
// Synthesize `var stringValue: String { get }`
auto stringType = Context.getStringDecl()->getDeclaredType();
auto stringType = Context.getStringDecl()->getDeclaredInterfaceType();
auto synth = [rawType, stringType](AbstractFunctionDecl *getterDecl) {
if (rawType && rawType->isEqual(stringType)) {
// enum SomeStringEnum : String {
@@ -393,7 +393,7 @@ ValueDecl *DerivedConformance::deriveCodingKey(ValueDecl *requirement) {
} else if (name == Context.Id_intValue) {
// Synthesize `var intValue: Int? { get }`
auto intType = Context.getIntDecl()->getDeclaredType();
auto intType = Context.getIntDecl()->getDeclaredInterfaceType();
auto optionalIntType = OptionalType::get(intType);
auto synth = [rawType, intType](AbstractFunctionDecl *getterDecl) {
@@ -422,7 +422,7 @@ ValueDecl *DerivedConformance::deriveCodingKey(ValueDecl *requirement) {
if (argumentNames.size() == 1) {
if (argumentNames[0] == Context.Id_stringValue) {
// Derive `init?(stringValue:)`
auto stringType = Context.getStringDecl()->getDeclaredType();
auto stringType = Context.getStringDecl()->getDeclaredInterfaceType();
auto synth = [rawType, stringType](AbstractFunctionDecl *initDecl) {
if (rawType && rawType->isEqual(stringType)) {
// enum SomeStringEnum : String {
@@ -455,7 +455,7 @@ ValueDecl *DerivedConformance::deriveCodingKey(ValueDecl *requirement) {
return deriveInitDecl(*this, stringType, Context.Id_stringValue, synth);
} else if (argumentNames[0] == Context.Id_intValue) {
// Synthesize `init?(intValue:)`
auto intType = Context.getIntDecl()->getDeclaredType();
auto intType = Context.getIntDecl()->getDeclaredInterfaceType();
auto synthesizer = [rawType, intType](AbstractFunctionDecl *initDecl) {
if (rawType && rawType->isEqual(intType)) {
// enum SomeIntEnum : Int {