RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-07-19 23:23:38 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

[TextAPI] Switch back to a custom Platform enum.

Browse Source 
Moving to PlatformType from BinaryFormat had some UB fallout when handing
unknown platforms or malformed input files.

This should fix the sanitizer bots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@347836 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Juergen Ributzka
2018-11-29 05:56:03 +00:00
parent 6ef7e18806
commit 8d8a63ebb5
6 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/TextAPI/MachO/TextStub.cpp
+2 -2
View File
@@ -515,11 +515,11 @@ template <> struct MappingTraits<const InterfaceFile *> {
std::vector<Architecture> Architectures;
std::vector<UUID> UUIDs;
PlatformType Platform;
PlatformKind Platform{PlatformKind::unknown};
StringRef InstallName;
PackedVersion CurrentVersion;
PackedVersion CompatibilityVersion;
SwiftVersion SwiftABIVersion;
SwiftVersion SwiftABIVersion{0};
ObjCConstraintType ObjCConstraint{ObjCConstraintType::None};
TBDFlags Flags{TBDFlags::None};
StringRef ParentUmbrella;
lib/TextAPI/MachO/TextStubCommon.cpp
+20 -19
View File
@@ -43,43 +43,44 @@ void ScalarEnumerationTraits<ObjCConstraintType>::enumeration(
IO.enumCase(Constraint, "gc", ObjCConstraintType::GC);
}
void ScalarTraits<PlatformType>::output(const PlatformType &Value, void *,
void ScalarTraits<PlatformKind>::output(const PlatformKind &Value, void *,
raw_ostream &OS) {
switch (Value) {
case PLATFORM_MACOS:
default:
llvm_unreachable("unexpected platform");
break;
case PlatformKind::macOS:
OS << "macosx";
break;
case PLATFORM_IOS:
case PlatformKind::iOS:
OS << "ios";
break;
case PLATFORM_WATCHOS:
case PlatformKind::watchOS:
OS << "watchos";
break;
case PLATFORM_TVOS:
case PlatformKind::tvOS:
OS << "tvos";
break;
case PLATFORM_BRIDGEOS:
case PlatformKind::bridgeOS:
OS << "bridgeos";
break;
}
}
StringRef ScalarTraits<PlatformType>::input(StringRef Scalar, void *,
PlatformType &Value) {
int Result = StringSwitch<unsigned>(Scalar)
.Case("macosx", PLATFORM_MACOS)
.Case("ios", PLATFORM_IOS)
.Case("watchos", PLATFORM_WATCHOS)
.Case("tvos", PLATFORM_TVOS)
.Case("bridgeos", PLATFORM_BRIDGEOS)
.Default(0);
StringRef ScalarTraits<PlatformKind>::input(StringRef Scalar, void *,
PlatformKind &Value) {
Value = StringSwitch<PlatformKind>(Scalar)
.Case("macosx", PlatformKind::macOS)
.Case("ios", PlatformKind::iOS)
.Case("watchos", PlatformKind::watchOS)
.Case("tvos", PlatformKind::tvOS)
.Case("bridgeos", PlatformKind::bridgeOS)
.Default(PlatformKind::unknown);
if (!Result)
if (Value == PlatformKind::unknown)
return "unknown platform";
Value = static_cast<PlatformType>(Result);
return {};
}
QuotingType ScalarTraits<PlatformType>::mustQuote(StringRef) {
QuotingType ScalarTraits<PlatformKind>::mustQuote(StringRef) {
return QuotingType::None;
}
lib/TextAPI/MachO/TextStubCommon.h
+3 -3
View File
@@ -43,9 +43,9 @@ template <> struct ScalarEnumerationTraits<MachO::ObjCConstraintType> {
static void enumeration(IO &, MachO::ObjCConstraintType &);
};
template <> struct ScalarTraits<MachO::PlatformType> {
static void output(const MachO::PlatformType &, void *, raw_ostream &);
static StringRef input(StringRef, void *, MachO::PlatformType &);
template <> struct ScalarTraits<MachO::PlatformKind> {
static void output(const MachO::PlatformKind &, void *, raw_ostream &);
static StringRef input(StringRef, void *, MachO::PlatformKind &);
static QuotingType mustQuote(StringRef);
};