Skip to content

Commit f3c7878

Browse files
committed
---
yaml --- r: 317182 b: refs/heads/master-rebranch c: 4fda7ca h: refs/heads/master
1 parent f06b51f commit f3c7878

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
14571457
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
14581458
refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
14591459
refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
1460-
refs/heads/master-rebranch: 0a6f902442b661c91b12f675a1a1513588d8b940
1460+
refs/heads/master-rebranch: 4fda7ca8ef3126a43dde2575e3cb2cc3004f34ea

branches/master-rebranch/lib/PrintAsObjC/PrintAsObjC.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2014,10 +2014,12 @@ class ReferencedTypeFinder : public TypeVisitor<ReferencedTypeFinder> {
20142014
}
20152015

20162016
void visitNameAliasType(NameAliasType *aliasTy) {
2017-
if (aliasTy->getDecl()->hasClangNode())
2017+
if (aliasTy->getDecl()->hasClangNode() &&
2018+
!aliasTy->getDecl()->isCompatibilityAlias()) {
20182019
Callback(*this, aliasTy->getDecl());
2019-
else
2020+
} else {
20202021
visit(aliasTy->getSinglyDesugaredType());
2022+
}
20212023
}
20222024

20232025
void visitParenType(ParenType *parenTy) {

branches/master-rebranch/test/PrintAsObjC/versioned.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ import VersionedFMWK
2424
// CHECK-NEXT: - (nullable instancetype)initFormerlyFailableValue:(NSInteger)value OBJC_DESIGNATED_INITIALIZER;
2525
} // CHECK-NEXT: @end
2626

27+
// Make sure we use forward declarations like we would for non-versioned names.
28+
// CHECK: @class InnerClass;
29+
2730
// CHECK-LABEL: @interface UsesNestedClass
2831
@objc class UsesNestedClass : NSObject {
2932
// CHECK-NEXT: - (InnerClass * _Nullable)foo SWIFT_WARN_UNUSED_RESULT;

0 commit comments

Comments
 (0)