maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lld-macho] Check simulator platforms to avoid issuing false positive errors. 

Currently the linker causes unnecessary errors when either the target or the config's platform is a simulator.

Differential Revision: https://reviews.llvm.org/D101855
This commit is contained in:
Vy Nguyen 2021-05-04 16:23:21 -04:00
parent ceccfaae14
commit 23233ad139
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lld/MachO/InputFiles.cpp
View File

@ -139,12 +139,26 @@ static Optional<PlatformInfo> getPlatformInfo(const InputFile *input) {
return None; return None;
} }
static PlatformKind removeSimulator(PlatformKind platform) {
// Mapping of platform to simulator and vice-versa.
static const std::map<PlatformKind, PlatformKind> platformMap = {
{PlatformKind::iOSSimulator, PlatformKind::iOS},
{PlatformKind::tvOSSimulator, PlatformKind::tvOS},
{PlatformKind::watchOSSimulator, PlatformKind::watchOS}};
auto iter = platformMap.find(platform);
if (iter == platformMap.end())
return platform;
return iter->second;
}
static bool checkCompatibility(const InputFile *input) { static bool checkCompatibility(const InputFile *input) {
Optional<PlatformInfo> platformInfo = getPlatformInfo(input); Optional<PlatformInfo> platformInfo = getPlatformInfo(input);
if (!platformInfo) if (!platformInfo)
return true; return true;
// TODO: Correctly detect simulator platforms or relax this check.
if (config->platform() != platformInfo->target.Platform) { if (removeSimulator(config->platform()) !=
removeSimulator(platformInfo->target.Platform)) {
error(toString(input) + " has platform " + error(toString(input) + " has platform " +
getPlatformName(platformInfo->target.Platform) + getPlatformName(platformInfo->target.Platform) +
Twine(", which is different from target platform ") + Twine(", which is different from target platform ") +

15
lld/test/MachO/invalid/incompatible-arch.s
View File

@ -30,6 +30,21 @@
# RUN: -o /dev/null 2>&1 | FileCheck %s --check-prefix=OBJ-VERSION # RUN: -o /dev/null 2>&1 | FileCheck %s --check-prefix=OBJ-VERSION
# OBJ-VERSION: {{.*}}test_x86.o has version 10.15.0, which is newer than target minimum of 10.14.0 # OBJ-VERSION: {{.*}}test_x86.o has version 10.15.0, which is newer than target minimum of 10.14.0
## Test that simulators platforms are compat with their simulatees.
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-ios14.0 %s -o %t/test_x86_ios.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-ios14.0-simulator %s -o %t/test_x86_ios_sim.o
# RUN: %lld -dylib -platform_version ios-simulator 14.0.0 14.0.0 %t/test_x86_ios.o -o /dev/null
# RUN: %lld -dylib -platform_version ios 14.0.0 14.0.0 %t/test_x86_ios_sim.o -o /dev/null
# RUN: not %lld -dylib -platform_version watchos-simulator 14.0.0 14.0.0 %t/test_x86_ios.o \
# RUN: -o /dev/null 2>&1 | FileCheck %s --check-prefix=CROSS-SIM
# CROSS-SIM: {{.*}}test_x86_ios.o has platform iOS, which is different from target platform watchOS Simulator
# RUN: not %lld -dylib -platform_version watchos-simulator 14.0.0 14.0.0 %t/test_x86_ios_sim.o \
# RUN: -o /dev/null 2>&1 | FileCheck %s --check-prefix=CROSS-SIM2
# CROSS-SIM2: {{.*}}test_x86_ios_sim.o has platform iOS Simulator, which is different from target platform watchOS Simulator
.globl _main .globl _main
_main: _main:
ret ret