Skip to content

[TextAPI] use unique sorted vector for holding target triples for #75959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2023
Merged

[TextAPI] use unique sorted vector for holding target triples for #75959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 31 additions & 18 deletions llvm/lib/TextAPI/BinaryReader/DylibReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
//===----------------------------------------------------------------------===//

#include "llvm/TextAPI/DylibReader.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Object/Binary.h"
#include "llvm/Object/MachOUniversal.h"
Expand All @@ -22,13 +23,25 @@
#include <set>
#include <sstream>
#include <string>
#include <tuple>

using namespace llvm;
using namespace llvm::object;
using namespace llvm::MachO;
using namespace llvm::MachO::DylibReader;

using TripleVec = std::vector<Triple>;
static typename TripleVec::iterator emplace(TripleVec &Container, Triple &&T) {
auto I = partition_point(Container, [=](const Triple &CT) {
return std::forward_as_tuple(CT.getArch(), CT.getOS(),
CT.getEnvironment()) <
std::forward_as_tuple(T.getArch(), T.getOS(), T.getEnvironment());
});

if (I != Container.end() && *I == T)
return I;
return Container.emplace(I, T);
}

static TripleVec constructTriples(MachOObjectFile *Obj,
const Architecture ArchT) {
Expand All @@ -53,61 +66,61 @@ static TripleVec constructTriples(MachOObjectFile *Obj,
switch (cmd.C.cmd) {
case MachO::LC_VERSION_MIN_MACOSX:
OSVersion = getOSVersion(cmd);
Triples.emplace_back(Arch, "apple", "macos" + OSVersion);
emplace(Triples, {Arch, "apple", "macos" + OSVersion});
break;
case MachO::LC_VERSION_MIN_IPHONEOS:
OSVersion = getOSVersion(cmd);
if (IsIntel)
Triples.emplace_back(Arch, "apple", "ios" + OSVersion, "simulator");
emplace(Triples, {Arch, "apple", "ios" + OSVersion, "simulator"});
else
Triples.emplace_back(Arch, "apple", "ios" + OSVersion);
emplace(Triples, {Arch, "apple", "ios" + OSVersion});
break;
case MachO::LC_VERSION_MIN_TVOS:
OSVersion = getOSVersion(cmd);
if (IsIntel)
Triples.emplace_back(Arch, "apple", "tvos" + OSVersion, "simulator");
emplace(Triples, {Arch, "apple", "tvos" + OSVersion, "simulator"});
else
Triples.emplace_back(Arch, "apple", "tvos" + OSVersion);
emplace(Triples, {Arch, "apple", "tvos" + OSVersion});
break;
case MachO::LC_VERSION_MIN_WATCHOS:
OSVersion = getOSVersion(cmd);
if (IsIntel)
Triples.emplace_back(Arch, "apple", "watchos" + OSVersion, "simulator");
emplace(Triples, {Arch, "apple", "watchos" + OSVersion, "simulator"});
else
Triples.emplace_back(Arch, "apple", "watchos" + OSVersion);
emplace(Triples, {Arch, "apple", "watchos" + OSVersion});
break;
case MachO::LC_BUILD_VERSION: {
OSVersion = getOSVersionStr(Obj->getBuildVersionLoadCommand(cmd).minos);
switch (Obj->getBuildVersionLoadCommand(cmd).platform) {
case MachO::PLATFORM_MACOS:
Triples.emplace_back(Arch, "apple", "macos" + OSVersion);
emplace(Triples, {Arch, "apple", "macos" + OSVersion});
break;
case MachO::PLATFORM_IOS:
Triples.emplace_back(Arch, "apple", "ios" + OSVersion);
emplace(Triples, {Arch, "apple", "ios" + OSVersion});
break;
case MachO::PLATFORM_TVOS:
Triples.emplace_back(Arch, "apple", "tvos" + OSVersion);
emplace(Triples, {Arch, "apple", "tvos" + OSVersion});
break;
case MachO::PLATFORM_WATCHOS:
Triples.emplace_back(Arch, "apple", "watchos" + OSVersion);
emplace(Triples, {Arch, "apple", "watchos" + OSVersion});
break;
case MachO::PLATFORM_BRIDGEOS:
Triples.emplace_back(Arch, "apple", "bridgeos" + OSVersion);
emplace(Triples, {Arch, "apple", "bridgeos" + OSVersion});
break;
case MachO::PLATFORM_MACCATALYST:
Triples.emplace_back(Arch, "apple", "ios" + OSVersion, "macabi");
emplace(Triples, {Arch, "apple", "ios" + OSVersion, "macabi"});
break;
case MachO::PLATFORM_IOSSIMULATOR:
Triples.emplace_back(Arch, "apple", "ios" + OSVersion, "simulator");
emplace(Triples, {Arch, "apple", "ios" + OSVersion, "simulator"});
break;
case MachO::PLATFORM_TVOSSIMULATOR:
Triples.emplace_back(Arch, "apple", "tvos" + OSVersion, "simulator");
emplace(Triples, {Arch, "apple", "tvos" + OSVersion, "simulator"});
break;
case MachO::PLATFORM_WATCHOSSIMULATOR:
Triples.emplace_back(Arch, "apple", "watchos" + OSVersion, "simulator");
emplace(Triples, {Arch, "apple", "watchos" + OSVersion, "simulator"});
break;
case MachO::PLATFORM_DRIVERKIT:
Triples.emplace_back(Arch, "apple", "driverkit" + OSVersion);
emplace(Triples, {Arch, "apple", "driverkit" + OSVersion});
break;
default:
break; // Skip any others.
Expand All @@ -122,7 +135,7 @@ static TripleVec constructTriples(MachOObjectFile *Obj,
// Record unknown platform for older binaries that don't enforce platform
// load commands.
if (Triples.empty())
Triples.emplace_back(Arch, "apple", "unknown");
emplace(Triples, {Arch, "apple", "unknown"});

return Triples;
}
Expand Down