Skip to content

Commit 055edaf

Browse files
allow CoreFoundation to declare CGFloat
1 parent 6d25565 commit 055edaf

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/AST/ASTContext.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4837,6 +4837,7 @@ bool ASTContext::isTypeBridgedInExternalModule(
48374837
// bridging implementations of CG types appear in the Foundation
48384838
// module.
48394839
nominal->getParentModule()->getName() == Id_CoreGraphics ||
4840+
nominal->getParentModule()->getName() == Id_CoreFoundation ||
48404841
// CoreMedia is a dependency of AVFoundation, but the bridged
48414842
// NSValue implementations for CMTime, CMTimeRange, and
48424843
// CMTimeMapping are provided by AVFoundation, and AVFoundation

lib/AST/Type.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,8 @@ bool TypeBase::isCGFloatType() {
826826
// On macOS `CGFloat` is part of a `CoreGraphics` module,
827827
// but on Linux it could be found in `Foundation`.
828828
return (module->getName().is("CoreGraphics") ||
829-
module->getName().is("Foundation")) &&
829+
module->getName().is("Foundation") ||
830+
module->getName().is("CoreFoundation")) &&
830831
NTD->getName().is("CGFloat");
831832
}
832833

0 commit comments

Comments
 (0)