Skip to content

Commit 32954fc

Browse files
committed
Use -read-legacy-type-info-path in Runtime/class-layout-from-objc.m test
1 parent bb4cae0 commit 32954fc

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
Name: Resilient
3+
Decls:
4+
- Name: 9Resilient12GrowsToInt64V
5+
Size: 8
6+
Alignment: 8
7+
ExtraInhabitants: 0
8+
...
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
Name: Resilient
3+
Decls:
4+
- Name: 9Resilient12GrowsToInt64V
5+
Size: 4
6+
Alignment: 4
7+
ExtraInhabitants: 0
8+
...

validation-test/Runtime/class-layout-from-objc.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// RUN: %target-build-swift -emit-library -emit-module -o %t/libResilient.dylib %S/Inputs/class-layout-from-objc/Resilient.swift -Xlinker -install_name -Xlinker @executable_path/libResilient.dylib -Xfrontend -enable-resilience -DSMALL
66

77
// RUN: %target-clang -c %S/Inputs/class-layout-from-objc/OneWordSuperclass.m -fmodules -fobjc-arc -o %t/OneWordSuperclass.o
8-
// RUN: %target-build-swift -emit-library -o %t/libClasses.dylib -emit-objc-header-path %t/Classes.h -I %t -I %S/Inputs/class-layout-from-objc/ %S/Inputs/class-layout-from-objc/Classes.swift %t/OneWordSuperclass.o -Xlinker -install_name -Xlinker @executable_path/libClasses.dylib -lResilient -L %t
8+
// RUN: %target-build-swift -emit-library -o %t/libClasses.dylib -emit-objc-header-path %t/Classes.h -I %t -I %S/Inputs/class-layout-from-objc/ %S/Inputs/class-layout-from-objc/Classes.swift %t/OneWordSuperclass.o -Xlinker -install_name -Xlinker @executable_path/libClasses.dylib -lResilient -L %t -Xfrontend -read-legacy-type-info-path=%S/Inputs/class-layout-from-objc/small.yaml
99
// RUN: %target-clang %s -I %S/Inputs/class-layout-from-objc/ -I %t -fmodules -fobjc-arc -o %t/main -lResilient -lClasses -L %t
1010
// RUN: %target-codesign %t/main %t/libResilient.dylib %t/libClasses.dylib
1111
// RUN: %target-run %t/main OLD %t/libResilient.dylib %t/libClasses.dylib
@@ -15,7 +15,7 @@
1515
// RUN: %target-run %t/main NEW %t/libResilient.dylib %t/libClasses.dylib
1616

1717
// Try again when the class itself is also resilient.
18-
// RUN: %target-build-swift -emit-library -o %t/libClasses.dylib -emit-objc-header-path %t/Classes.h -I %S/Inputs/class-layout-from-objc/ -I %t %S/Inputs/class-layout-from-objc/Classes.swift %t/OneWordSuperclass.o -Xlinker -install_name -Xlinker @executable_path/libClasses.dylib -lResilient -L %t
18+
// RUN: %target-build-swift -emit-library -o %t/libClasses.dylib -emit-objc-header-path %t/Classes.h -I %S/Inputs/class-layout-from-objc/ -I %t %S/Inputs/class-layout-from-objc/Classes.swift %t/OneWordSuperclass.o -Xlinker -install_name -Xlinker @executable_path/libClasses.dylib -lResilient -L %t -Xfrontend -read-legacy-type-info-path=%S/Inputs/class-layout-from-objc/big.yaml
1919
// RUN: %target-codesign %t/libClasses.dylib
2020
// RUN: %target-run %t/main OLD %t/libResilient.dylib %t/libClasses.dylib
2121

0 commit comments

Comments
 (0)