File tree Expand file tree Collapse file tree 6 files changed +10
-8
lines changed Expand file tree Collapse file tree 6 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -1151,6 +1151,8 @@ TypeConverter::TypeConverter(IRGenModule &IGM)
1151
1151
if (IGM.IRGen .Opts .EnableResilienceBypass )
1152
1152
LoweringMode = Mode::CompletelyFragile;
1153
1153
1154
+ const auto &Triple = IGM.Context .LangOpts .Target ;
1155
+
1154
1156
// We have a bunch of -parse-stdlib tests that pass a -target in the test
1155
1157
// suite. To prevent these from failing when the user hasn't build the
1156
1158
// standard library for that target, we pass -disable-legacy-type-info to
@@ -1165,8 +1167,8 @@ TypeConverter::TypeConverter(IRGenModule &IGM)
1165
1167
// If the flag was not explicitly specified, look for a file in a
1166
1168
// platform-specific location, if this platform is known to require
1167
1169
// one.
1168
- auto platformName = getPlatformNameForTriple (IGM. Triple );
1169
- auto archName = getMajorArchitectureName (IGM. Triple );
1170
+ auto platformName = getPlatformNameForTriple (Triple);
1171
+ auto archName = swift:: getMajorArchitectureName (Triple);
1170
1172
1171
1173
if (!doesPlatformUseLegacyLayouts (platformName, archName))
1172
1174
return ;
Original file line number Diff line number Diff line change 1
- // RUN: %swift -target armv7-apple-ios7 %s -gnone -emit-ir -o - | %FileCheck %s -check-prefix=IOS
2
- // RUN: %swift -target armv7k-apple-watchos2 %s -gnone -emit-ir -o - | %FileCheck %s -check-prefix=WATCHOS
1
+ // RUN: %swift -target armv7-apple-ios7 -disable-legacy-type-info %s -gnone -emit-ir -o - | %FileCheck %s -check-prefix=IOS
2
+ // RUN: %swift -target armv7k-apple-watchos2 -disable-legacy-type-info %s -gnone -emit-ir -o - | %FileCheck %s -check-prefix=WATCHOS
3
3
4
4
// REQUIRES: CODEGENERATOR=ARM
5
5
Original file line number Diff line number Diff line change 1
- // RUN: %swift -gnone -O -target armv7-apple-ios7 -emit-assembly %s -o - | %FileCheck %s
1
+ // RUN: %swift -gnone -O -target armv7-apple-ios7 -disable-legacy-type-info - emit-assembly %s -o - | %FileCheck %s
2
2
3
3
// REQUIRES: CODEGENERATOR=ARM
4
4
Original file line number Diff line number Diff line change 1
- // RUN: %swift -module-name bridge_object -emit-ir -target armv7-apple-ios8.0 %s | %FileCheck %s
1
+ // RUN: %swift -module-name bridge_object -emit-ir -target armv7-apple-ios8.0 -disable-legacy-type-info %s | %FileCheck %s
2
2
3
3
// REQUIRES: CODEGENERATOR=ARM
4
4
Original file line number Diff line number Diff line change 1
- // RUN: %swift -target armv7-apple-ios10 -module-name integer_literal %s -gnone -emit-ir | %FileCheck %s
1
+ // RUN: %swift -target armv7-apple-ios10 -disable-legacy-type-info - module-name integer_literal %s -gnone -emit-ir | %FileCheck %s
2
2
3
3
// REQUIRES: CODEGENERATOR=ARM
4
4
Original file line number Diff line number Diff line change 1
- // RUN: %swift -target armv7-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck %s
1
+ // RUN: %swift -target armv7-apple-ios7.1 -disable-legacy-type-info %s -module-name main -emit-ir -o - | %FileCheck %s
2
2
3
3
// REQUIRES: CODEGENERATOR=ARM
4
4
You can’t perform that action at this time.
0 commit comments