Skip to content

Commit 79444c4

Browse files
gottesmmgottesmm
authored
Merge pull request #28174 from gottesmm/pr-7bbd01cc86ac04db4e31ad2128d842d7205d3314
[irgen] Force emission of objc class refs for non-foreign clang objc classes whose metadata we use.
2 parents bf1ed00 + 8247525 commit 79444c4

20 files changed

+120
-24
lines changed

‎lib/IRGen/GenDecl.cpp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,27 @@ void IRGenerator::noteUseOfTypeGlobals(NominalTypeDecl *type,
12591259
}
12601260
}
12611261

1262+
// Force emission of ObjC class refs used by type refs.
1263+
//
1264+
// Otherwise, autolinking can fail if we try to load the class decl from the
1265+
// name of the class.
1266+
if (auto *classDecl = dyn_cast<ClassDecl>(type)) {
1267+
// The logic behind this predicate is that:
1268+
//
1269+
// 1. We need to check if a class decl is foreign to exclude CF classes.
1270+
//
1271+
// 2. We want to check that the class decl is objc to exclude c++ classes in
1272+
// the future.
1273+
//
1274+
// 3. We check that we have a clang node since we want to ensure we have
1275+
// something coming from clang, rather than from swift which does not
1276+
// have this issue.
1277+
if (classDecl->hasClangNode() && classDecl->isObjC() && !classDecl->isForeign()) {
1278+
PrimaryIGM->getAddrOfObjCClassRef(classDecl);
1279+
return;
1280+
}
1281+
}
1282+
12621283
if (!hasLazyMetadata(type))
12631284
return;
12641285

‎test/IRGen/autolink_classlookup_test.swift

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// RUN: %empty-directory(%t)
2+
//
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: mkdir -p %t/ObjCClasses.framework/Headers
5+
// RUN: cp %S/../Inputs/ObjCClasses/ObjCClasses.h %t/ObjCClasses.framework/Headers
6+
// RUN: mkdir -p %t/ObjCClasses.framework/Modules
7+
// RUN: cp %S/../Inputs/ObjCClasses/framework.module.map %t/ObjCClasses.framework/Modules/module.modulemap
8+
// RUN: %target-clang -dynamiclib -fobjc-arc -fmodules %t/ObjCClasses.o -o %t/ObjCClasses.framework/ObjCClasses
9+
// RUN: %target-codesign %t/ObjCClasses.framework/ObjCClasses
10+
11+
// RUN: %target-build-swift -emit-ir -F %t %s -o - | %FileCheck %s
12+
13+
// REQUIRES: objc_interop
14+
15+
// Make sure that we have our class ref here.
16+
// CHECK-DAG: @"OBJC_CLASS_REF_$_Animal"
17+
18+
// And make sure we have ObjCClasses in our autolinking info.
19+
//
20+
// CHECK-DAG: !{{[0-9][0-9]*}} = !{!"-framework", !"ObjCClasses"}
21+
22+
// Make sure that we emit an objc class ref to Animal so autolinking does not
23+
// fail.
24+
25+
import ObjCClasses
26+
27+
func main() {
28+
let a = Animal()
29+
print(a)
30+
}
31+
32+
main()

‎test/Interpreter/Inputs/ObjCClasses/ObjCClasses.h renamed to ‎test/Inputs/ObjCClasses/ObjCClasses.h

File renamed without changes.

‎test/Interpreter/Inputs/ObjCClasses/ObjCClasses.m renamed to ‎test/Inputs/ObjCClasses/ObjCClasses.m

File renamed without changes.

‎test/Inputs/ObjCClasses/framework.module.map

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
// Module map used only if ObjCClasses are compiled into a framework, not using
3+
// -import-objc-header.
4+
5+
framework module ObjCClasses {
6+
header "ObjCClasses.h"
7+
}

‎test/Interpreter/Inputs/ObjCClasses/module.map renamed to ‎test/Inputs/ObjCClasses/module.map

File renamed without changes.

‎test/Interpreter/SDK/Inputs/mixed_mode/ObjCStuff.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
#import "ObjCStuff.h"
3+
4+
@implementation OJCCloud
5+
@end

‎test/Interpreter/SDK/mixed_mode_class_with_missing_properties.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// RUN: %empty-directory(%t)
22
// RUN: cp %s %t/main.swift
3+
// RUN: %target-clang -c -o %t/ObjCStuff.o -fobjc-arc -I %t -I %S/Inputs/mixed_mode %S/Inputs/mixed_mode/ObjCStuff.m -fmodules
34
// RUN: %target-build-swift -whole-module-optimization -emit-module-path %t/UsingObjCStuff.swiftmodule -c -o %t/UsingObjCStuff.o -module-name UsingObjCStuff -I %t -I %S/Inputs/mixed_mode -swift-version 5 -parse-as-library %S/Inputs/mixed_mode/UsingObjCStuff.swift
4-
// RUN: %target-build-swift -o %t/a.out.v4 -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 4 %t/main.swift %t/UsingObjCStuff.o
5-
// RUN: %target-build-swift -o %t/a.out.v5 -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 5 %t/main.swift %t/UsingObjCStuff.o
5+
// RUN: %target-build-swift -o %t/a.out.v4 -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 4 %t/main.swift %t/UsingObjCStuff.o %t/ObjCStuff.o
6+
// RUN: %target-build-swift -o %t/a.out.v5 -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 5 %t/main.swift %t/UsingObjCStuff.o %t/ObjCStuff.o
67
// RUN: %target-codesign %t/a.out.v4
78
// RUN: %target-codesign %t/a.out.v5
89
// RUN: %target-run %t/a.out.v4 | %FileCheck %s

‎test/Interpreter/autolink_classlookup_test.swift

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// RUN: %empty-directory(%t)
2+
//
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: mkdir -p %t/ObjCClasses.framework/Headers
5+
// RUN: cp %S/../Inputs/ObjCClasses/ObjCClasses.h %t/ObjCClasses.framework/Headers
6+
// RUN: mkdir -p %t/ObjCClasses.framework/Modules
7+
// RUN: cp %S/../Inputs/ObjCClasses/framework.module.map %t/ObjCClasses.framework/Modules/module.modulemap
8+
// RUN: %target-clang -dynamiclib -fobjc-arc -fmodules %t/ObjCClasses.o -o %t/ObjCClasses.framework/ObjCClasses
9+
// RUN: %target-codesign %t/ObjCClasses.framework/ObjCClasses
10+
11+
// RUN: %target-build-swift -F %t %s -o %t/main
12+
// RUN: %target-codesign %t/main
13+
// RUN: %target-run %t/main %t/ObjCClasses.framework
14+
15+
// REQUIRES: executable_test
16+
// REQUIRES: objc_interop
17+
18+
// Make sure that functionally if we refer to an objc class via autolinking such
19+
// that the class is not needed by the module directly, we still emit an objc
20+
// class ref to ensure that the static linker links against the autolinked
21+
// library.
22+
23+
import ObjCClasses
24+
25+
func main() {
26+
let a = Animal()
27+
print(a)
28+
}
29+
30+
main()

‎test/Interpreter/errors_imported.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
//
3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -I %S/../Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out
77

‎test/Interpreter/generic_objc_subclass.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
//
3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -I %S/../Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out | %FileCheck %s
77

‎test/Interpreter/imported_objc_generics.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
//
3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -I %S/../Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out
77

‎test/Interpreter/imported_objc_generics_extension.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
//
3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -I %S/../Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out
77

‎test/Interpreter/objc_bool.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
//
3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -I %S/../Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out
77

‎test/Interpreter/objc_class_properties.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %clang %target-cc-options -isysroot %sdk -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %clang %target-cc-options -isysroot %sdk -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -I %S/../Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out
77

‎test/Interpreter/objc_class_properties_runtime.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %clang -arch x86_64 -mmacosx-version-min=10.11 -isysroot %sdk -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
3+
// RUN: %clang -arch x86_64 -mmacosx-version-min=10.11 -isysroot %sdk -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
44

5-
// RUN: %swiftc_driver -target $(echo '%target-triple' | sed -E -e 's/macosx10.(9|10).*/macosx10.11/') -sdk %sdk -I %S/Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
5+
// RUN: %swiftc_driver -target $(echo '%target-triple' | sed -E -e 's/macosx10.(9|10).*/macosx10.11/') -sdk %sdk -I %S/../Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
66
// RUN: %t/a.out
77

88
// REQUIRES: OS=macosx

‎test/Interpreter/objc_class_resilience.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
44
// RUN: %target-build-swift-dylib(%t/%target-library-name(resilient_struct)) -enable-library-evolution %S/../Inputs/resilient_struct.swift -emit-module -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct
55
// RUN: %target-codesign %t/%target-library-name(resilient_struct)
66

7-
// RUN: %target-build-swift %s -L %t -I %t -lresilient_struct -I %S/Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o -o %t/main %target-rpath(%t)
7+
// RUN: %target-build-swift %s -L %t -I %t -lresilient_struct -I %S/../Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o -o %t/main %target-rpath(%t)
88
// RUN: %target-codesign %t/main
99

1010
// RUN: %target-run %t/main %t/%target-library-name(resilient_struct)

‎test/Interpreter/objc_failable_initializers.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
//
3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -I %S/../Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out
77

‎test/Interpreter/objc_throwing_initializers.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
//
3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -I %S/../Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out
77

‎test/Interpreter/objc_types_as_members.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
//
3-
// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4-
// RUN: %target-build-swift -O -I %S/Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
3+
// RUN: %target-clang -fobjc-arc %S/../Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
4+
// RUN: %target-build-swift -O -I %S/../Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out
55
// RUN: %target-codesign %t/a.out
66
// RUN: %target-run %t/a.out
77

0 commit comments

Comments
 (0)