Skip to content

Commit d82b683

Browse files
DataCorruptedDataCorrupted
committed
Default relative method lest: all platforms are included
Category merging: Change tests to reflect that both flag is needed to crash Signed-off-by: Peter Rong <PeterRong@meta.com>
1 parent dee85bc commit d82b683

4 files changed

+66
-65
lines changed

‎lld/MachO/Driver.cpp

+55-51
Original file line numberDiff line numberDiff line change
@@ -1042,20 +1042,36 @@ static bool shouldAdhocSignByDefault(Architecture arch, PlatformType platform) {
10421042
platform == PLATFORM_XROS_SIMULATOR;
10431043
}
10441044

1045-
static bool dataConstDefault(const InputArgList &args) {
1046-
static const std::array<std::pair<PlatformType, VersionTuple>, 6> minVersion =
1047-
{{{PLATFORM_MACOS, VersionTuple(10, 15)},
1048-
{PLATFORM_IOS, VersionTuple(13, 0)},
1049-
{PLATFORM_TVOS, VersionTuple(13, 0)},
1050-
{PLATFORM_WATCHOS, VersionTuple(6, 0)},
1051-
{PLATFORM_XROS, VersionTuple(1, 0)},
1052-
{PLATFORM_BRIDGEOS, VersionTuple(4, 0)}}};
1053-
PlatformType platform = removeSimulator(config->platformInfo.target.Platform);
1054-
auto it = llvm::find_if(minVersion,
1045+
template <unsigned long N>
1046+
using MinVersions = std::array<std::pair<PlatformType, VersionTuple>, N>;
1047+
1048+
/// Returns true if the platform is greater than the min version.
1049+
/// Returns false if the platform does not exist.
1050+
template <unsigned long N>
1051+
static bool greaterEqMinVersion(const MinVersions<N> &minVersions,
1052+
bool ignoreSimulator) {
1053+
PlatformType platform = config->platformInfo.target.Platform;
1054+
if (ignoreSimulator)
1055+
platform = removeSimulator(platform);
1056+
auto it = llvm::find_if(minVersions,
10551057
[&](const auto &p) { return p.first == platform; });
1056-
if (it != minVersion.end())
1057-
if (config->platformInfo.target.MinDeployment < it->second)
1058-
return false;
1058+
if (it != minVersions.end())
1059+
if (config->platformInfo.target.MinDeployment >= it->second)
1060+
return true;
1061+
return false;
1062+
}
1063+
1064+
static bool dataConstDefault(const InputArgList &args) {
1065+
static const MinVersions<6> minVersion = {{
1066+
{PLATFORM_MACOS, VersionTuple(10, 15)},
1067+
{PLATFORM_IOS, VersionTuple(13, 0)},
1068+
{PLATFORM_TVOS, VersionTuple(13, 0)},
1069+
{PLATFORM_WATCHOS, VersionTuple(6, 0)},
1070+
{PLATFORM_XROS, VersionTuple(1, 0)},
1071+
{PLATFORM_BRIDGEOS, VersionTuple(4, 0)},
1072+
}};
1073+
if (!greaterEqMinVersion(minVersion, true))
1074+
return false;
10591075

10601076
switch (config->outputType) {
10611077
case MH_EXECUTE:
@@ -1106,30 +1122,18 @@ static bool shouldEmitChainedFixups(const InputArgList &args) {
11061122
if (requested)
11071123
return true;
11081124

1109-
static const std::array<std::pair<PlatformType, VersionTuple>, 9> minVersion =
1110-
{{
1111-
{PLATFORM_IOS, VersionTuple(13, 4)},
1112-
{PLATFORM_IOSSIMULATOR, VersionTuple(16, 0)},
1113-
{PLATFORM_MACOS, VersionTuple(13, 0)},
1114-
{PLATFORM_TVOS, VersionTuple(14, 0)},
1115-
{PLATFORM_TVOSSIMULATOR, VersionTuple(15, 0)},
1116-
{PLATFORM_WATCHOS, VersionTuple(7, 0)},
1117-
{PLATFORM_WATCHOSSIMULATOR, VersionTuple(8, 0)},
1118-
{PLATFORM_XROS, VersionTuple(1, 0)},
1119-
{PLATFORM_XROS_SIMULATOR, VersionTuple(1, 0)},
1120-
}};
1121-
PlatformType platform = config->platformInfo.target.Platform;
1122-
auto it = llvm::find_if(minVersion,
1123-
[&](const auto &p) { return p.first == platform; });
1124-
1125-
// We don't know the versions for other platforms, so default to disabled.
1126-
if (it == minVersion.end())
1127-
return false;
1128-
1129-
if (it->second > config->platformInfo.target.MinDeployment)
1130-
return false;
1131-
1132-
return true;
1125+
static const MinVersions<9> minVersion = {{
1126+
{PLATFORM_IOS, VersionTuple(13, 4)},
1127+
{PLATFORM_IOSSIMULATOR, VersionTuple(16, 0)},
1128+
{PLATFORM_MACOS, VersionTuple(13, 0)},
1129+
{PLATFORM_TVOS, VersionTuple(14, 0)},
1130+
{PLATFORM_TVOSSIMULATOR, VersionTuple(15, 0)},
1131+
{PLATFORM_WATCHOS, VersionTuple(7, 0)},
1132+
{PLATFORM_WATCHOSSIMULATOR, VersionTuple(8, 0)},
1133+
{PLATFORM_XROS, VersionTuple(1, 0)},
1134+
{PLATFORM_XROS_SIMULATOR, VersionTuple(1, 0)},
1135+
}};
1136+
return greaterEqMinVersion(minVersion, false);
11331137
}
11341138

11351139
static bool shouldEmitRelativeMethodLists(const InputArgList &args) {
@@ -1140,20 +1144,20 @@ static bool shouldEmitRelativeMethodLists(const InputArgList &args) {
11401144
if (arg && arg->getOption().getID() == OPT_no_objc_relative_method_lists)
11411145
return false;
11421146

1143-
// If no flag is specified:
1144-
// - default true on >= ios14/macos11
1145-
// - default false on everything else
1146-
switch (config->platformInfo.target.Platform) {
1147-
case PLATFORM_IOS:
1148-
case PLATFORM_IOSSIMULATOR:
1149-
return config->platformInfo.target.MinDeployment >= VersionTuple(14, 0);
1150-
case PLATFORM_MACOS:
1151-
return config->platformInfo.target.MinDeployment >= VersionTuple(11, 0);
1152-
default:
1153-
return false;
1154-
};
1155-
llvm_unreachable("RelativeMethodList should default to false, control flow "
1156-
"should not reach here");
1147+
// If no flag is specified, enable this on newer versions by default.
1148+
// The min versions is taken from
1149+
// ld64(https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/src/ld/ld.hpp#L310)
1150+
// to mimic to operation of ld64
1151+
// [here](https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/src/ld/Options.cpp#L6085-L6101)
1152+
static const MinVersions<6> minVersion = {{
1153+
{PLATFORM_MACOS, VersionTuple(10, 16)},
1154+
{PLATFORM_IOS, VersionTuple(14, 0)},
1155+
{PLATFORM_WATCHOS, VersionTuple(7, 0)},
1156+
{PLATFORM_TVOS, VersionTuple(14, 0)},
1157+
{PLATFORM_BRIDGEOS, VersionTuple(5, 0)},
1158+
{PLATFORM_XROS, VersionTuple(1, 0)},
1159+
}};
1160+
return greaterEqMinVersion(minVersion, true);
11571161
}
11581162

11591163
void SymbolPatterns::clear() {

‎lld/test/MachO/objc-category-merging-complete-test.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
############ Test merging multiple categories into a single category ############
88
## Create a dylib to link against(a64_file1.dylib) and merge categories in the main binary (file2_merge_a64.exe)
99
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o a64_file1.o a64_file1.s
10-
# RUN: %lld -no_objc_relative_method_lists -arch arm64 a64_file1.o -o a64_file1.dylib -dylib
10+
# RUN: %lld -arch arm64 a64_file1.o -o a64_file1.dylib -dylib
1111

1212
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o a64_file2.o a64_file2.s
1313
# RUN: %lld -no_objc_relative_method_lists -arch arm64 -o a64_file2_no_merge.exe a64_file1.dylib a64_file2.o

‎lld/test/MachO/objc-category-merging-minimal.s

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
############ Test merging multiple categories into a single category ############
88
## Create a dylib with a fake base class to link against in when merging between categories
99
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o a64_fakedylib.o a64_fakedylib.s
10-
# RUN: %lld -no_objc_relative_method_lists -arch arm64 a64_fakedylib.o -o a64_fakedylib.dylib -dylib
10+
# RUN: %lld -arch arm64 a64_fakedylib.o -o a64_fakedylib.dylib -dylib
1111

1212
## Create our main testing dylib - linking against the fake dylib above
1313
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o merge_cat_minimal.o merge_cat_minimal.s
14-
# RUN: %lld -no_objc_relative_method_lists -arch arm64 -dylib -o merge_cat_minimal_no_merge.dylib a64_fakedylib.dylib merge_cat_minimal.o
14+
# RUN: %lld -arch arm64 -dylib -o merge_cat_minimal_no_merge.dylib a64_fakedylib.dylib merge_cat_minimal.o
1515
# RUN: %lld -no_objc_relative_method_lists -arch arm64 -dylib -o merge_cat_minimal_merge.dylib -objc_category_merging a64_fakedylib.dylib merge_cat_minimal.o
1616

1717
## Now verify that the flag caused category merging to happen appropriatelly
@@ -21,7 +21,7 @@
2121
############ Test merging multiple categories into the base class ############
2222
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o merge_base_class_minimal.o merge_base_class_minimal.s
2323
# RUN: %lld -no_objc_relative_method_lists -arch arm64 -dylib -o merge_base_class_minimal_yes_merge.dylib -objc_category_merging merge_base_class_minimal.o merge_cat_minimal.o
24-
# RUN: %lld -no_objc_relative_method_lists -arch arm64 -dylib -o merge_base_class_minimal_no_merge.dylib merge_base_class_minimal.o merge_cat_minimal.o
24+
# RUN: %lld -arch arm64 -dylib -o merge_base_class_minimal_no_merge.dylib merge_base_class_minimal.o merge_cat_minimal.o
2525

2626
# RUN: llvm-objdump --objc-meta-data --macho merge_base_class_minimal_no_merge.dylib | FileCheck %s --check-prefixes=NO_MERGE_INTO_BASE
2727
# RUN: llvm-objdump --objc-meta-data --macho merge_base_class_minimal_yes_merge.dylib | FileCheck %s --check-prefixes=YES_MERGE_INTO_BASE

‎lld/test/MachO/objc-relative-method-lists-simple.s

+7-10
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# UNSUPPORTED: target=arm{{.*}}-unknown-linux-gnueabihf
33
# RUN: rm -rf %t; split-file %s %t && cd %t
44

5-
## Compile a64_rel_dylib.o with MacOS 11
6-
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos11 -o a64_rel_dylib.o a64_simple_class.s
5+
## Compile a64_rel_dylib.o
6+
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos10.15 -o a64_rel_dylib.o a64_simple_class.s
77

88
## Test arm64 + relative method lists
99
# RUN: %no-lsystem-lld a64_rel_dylib.o -o a64_rel_dylib.dylib -map a64_rel_dylib.map -dylib -arch arm64
@@ -17,19 +17,16 @@
1717
# RUN: %no-lsystem-lld a64_rel_dylib.o -o a64_rel_dylib.dylib -map a64_rel_dylib.map -dylib -arch arm64 -no_objc_relative_method_lists
1818
# RUN: llvm-objdump --macho --objc-meta-data a64_rel_dylib.dylib | FileCheck %s --check-prefix=CHK_NO_REL
1919

20-
## Compile a64_rel_dylib.o with MacOS 10
21-
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos10 -o a64_rel_dylib.o a64_simple_class.s
22-
2320
## Test arm64 + relative method lists by explicitly adding `-objc_relative_method_lists`.
24-
# RUN: %lld a64_rel_dylib.o -o a64_rel_dylib.dylib -map a64_rel_dylib.map -dylib -arch arm64 -platform_version macOS 10.0 10.0 -objc_relative_method_lists
21+
# RUN: %lld a64_rel_dylib.o -o a64_rel_dylib.dylib -map a64_rel_dylib.map -dylib -arch arm64 -platform_version macOS 10.15 10.15 -objc_relative_method_lists
2522
# RUN: llvm-objdump --macho --objc-meta-data a64_rel_dylib.dylib | FileCheck %s --check-prefix=CHK_REL
2623

2724
## Test arm64 + no relative method lists by default.
28-
# RUN: %lld a64_rel_dylib.o -o a64_rel_dylib.dylib -map a64_rel_dylib.map -dylib -arch arm64 -platform_version macOS 10.0 10.0
25+
# RUN: %lld a64_rel_dylib.o -o a64_rel_dylib.dylib -map a64_rel_dylib.map -dylib -arch arm64 -platform_version macOS 10.15 10.15
2926
# RUN: llvm-objdump --macho --objc-meta-data a64_rel_dylib.dylib | FileCheck %s --check-prefix=CHK_NO_REL
3027

3128

32-
CHK_REL: Contents of (__DATA{{(_CONST)?}},__objc_classlist) section
29+
CHK_REL: Contents of (__DATA_CONST,__objc_classlist) section
3330
CHK_REL-NEXT: _OBJC_CLASS_$_MyClass
3431
CHK_REL: baseMethods
3532
CHK_REL-NEXT: entsize 12 (relative)
@@ -62,7 +59,7 @@ CHK_REL-NEXT: imp 0x{{[0-9a-f]*}} (0x{{[0-9a-f]*}}) +[MyClass class_method_0
6259

6360
CHK_NO_REL-NOT: (relative)
6461

65-
CHK_NO_REL: Contents of (__DATA{{(_CONST)?}},__objc_classlist) section
62+
CHK_NO_REL: Contents of (__DATA_CONST,__objc_classlist) section
6663
CHK_NO_REL-NEXT: _OBJC_CLASS_$_MyClass
6764

6865
CHK_NO_REL: baseMethods 0x{{[0-9a-f]*}} (struct method_list_t *)
@@ -136,7 +133,7 @@ CHK_NO_REL-NEXT: imp +[MyClass class_method_02]
136133
.include "objc-macros.s"
137134

138135
.section __TEXT,__text,regular,pure_instructions
139-
.build_version macos, 10, 0
136+
.build_version macos, 10, 15
140137

141138
.objc_selector_def "-[MyClass instance_method_00]"
142139
.objc_selector_def "-[MyClass instance_method_01]"

0 commit comments

Comments
 (0)