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] Downgrade the redundant conformance error to a warning for conformances

Browse Source 
originally stated in CoreGraphics.
This commit is contained in:
Holly Borla
2022-07-21 12:03:12 -07:00
parent 2f78f5a7b3
commit 25f10b9164
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Sema/TypeCheckProtocol.cpp
View File

@@ -6563,7 +6563,8 @@ void TypeChecker::checkConformancesInContext(IterableDeclContext *idc) {
if (existingModule != dc->getParentModule() &&
(existingModule->getName() ==
extendedNominal->getParentModule()->getName() ||
existingModule == diag.Protocol->getParentModule())) {
existingModule == diag.Protocol->getParentModule() ||
existingModule->getName().is("CoreGraphics"))) {
// Warn about the conformance.
auto diagID = differentlyConditional
? diag::redundant_conformance_adhoc_conditional

3
test/ClangImporter/import-cgfloat-api.swift
View File

@@ -17,3 +17,6 @@ func test() -> UnsafeMutablePointer<CGFloat>? {
return CGColorGetComponents(color)
}
// Allow redundant conformances on CoreFoundation
// types where the conformance is in CoreGraphics.
extension CGFloat: CustomStringConvertible {}

6
test/Inputs/clang-importer-sdk/swift-modules/CoreGraphics.swift
View File

@@ -52,3 +52,9 @@ public extension Double {
}
}
#endif
import CoreFoundation
extension CGFloat: CustomStringConvertible {
public var description: String { "" }
}

2
test/PrintAsObjC/bridged-known-types-cf-cgfloat.swift
View File

@@ -10,7 +10,7 @@
// RUN: %target-swift-frontend -typecheck %s -parse-as-library -emit-objc-header-path %t/swift.h
// RUN: %FileCheck %s < %t/swift.h
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -DCGFLOAT_IN_COREFOUNDATION -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreFoundation.swift
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -DCGFLOAT_IN_COREFOUNDATION -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreGraphics.swift
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -DCGFLOAT_IN_COREFOUNDATION -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreGraphics.swift
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %clang-importer-sdk-path/swift-modules/Foundation.swift
// REQUIRES: objc_interop