Skip to content

Commit fdc927e

Browse files
committed
[PrintAsObjC] Add missing SWIFT_COMPILE_NAME for classes renamed with @objc.
This could prevent mixed-source frameworks from being properly imported into Swift. rdar://problem/21930630 Swift SVN r30541
1 parent 0e299cd commit fdc927e

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

lib/PrintAsObjC/PrintAsObjC.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,6 +1603,7 @@ class ModuleWriter {
16031603
"SWIFT_CLASS_EXTRA\n"
16041604
"# define SWIFT_CLASS_NAMED(SWIFT_NAME) "
16051605
"__attribute__((objc_subclassing_restricted)) "
1606+
"SWIFT_COMPILE_NAME(SWIFT_NAME) "
16061607
"SWIFT_CLASS_EXTRA\n"
16071608
"# else\n"
16081609
"# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) "

test/PrintAsObjC/empty.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
// CHECK: # define SWIFT_METATYPE(X)
1919
// CHECK: # define SWIFT_CLASS
20+
// CHECK: # define SWIFT_CLASS_NAMED
2021
// CHECK: # define SWIFT_PROTOCOL
22+
// CHECK: # define SWIFT_PROTOCOL_NAMED
2123
// CHECK: # define SWIFT_EXTENSION(M)
2224
// CHECK: # define OBJC_DESIGNATED_INITIALIZER
2325

test/PrintAsObjC/swift_name.m

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// RUN: rm -rf %t && mkdir %t
2+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %S/../Inputs/empty.swift -parse -emit-objc-header-path %t/empty.h
3+
// RUN: %clang -E -fobjc-arc -fmodules -I %t %s | FileCheck %s
4+
5+
// REQUIRES: objc_interop
6+
7+
#import "empty.h"
8+
9+
@class ABC; // CHECK-LABEL: @class ABC;
10+
SWIFT_CLASS(abc) // CHECK-NEXT: __attribute__((objc_runtime_name(abc)))
11+
@interface ABC // CHECK-NEXT: @interface
12+
@end
13+
14+
@class DEF; // CHECK-LABEL: @class DEF;
15+
SWIFT_CLASS_NAMED(def) // CHECK-NEXT: __attribute__((swift_name(def)))
16+
@interface DEF // CHECK-NEXT: @interface
17+
@end
18+
19+
@protocol AAA; // CHECK-LABEL: @protocol AAA;
20+
SWIFT_PROTOCOL(aaa) // CHECK-NEXT: __attribute__((objc_runtime_name(aaa)))
21+
@protocol AAA // CHECK-NEXT: @protocol
22+
@end
23+
24+
@protocol BBB; // CHECK-LABEL: @protocol BBB;
25+
SWIFT_PROTOCOL_NAMED(bbb) // CHECK-NEXT: __attribute__((swift_name(bbb)))
26+
@protocol BBB // CHECK-NEXT: @protocol
27+
@end

0 commit comments

Comments
 (0)