projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused member variable.
[oota-llvm.git]
/
lib
/
Support
/
TargetRegistry.cpp
diff --git
a/lib/Support/TargetRegistry.cpp
b/lib/Support/TargetRegistry.cpp
index 6e0e223ba700b1ffd4438b37d15346313fdaeb25..f6918835f74bed5833cfb1edfc3a09c9bd696069 100644
(file)
--- a/
lib/Support/TargetRegistry.cpp
+++ b/
lib/Support/TargetRegistry.cpp
@@
-17,7
+17,7
@@
using namespace llvm;
// Clients are responsible for avoid race conditions in registration.
using namespace llvm;
// Clients are responsible for avoid race conditions in registration.
-static Target *FirstTarget =
0
;
+static Target *FirstTarget =
nullptr
;
TargetRegistry::iterator TargetRegistry::begin() {
return iterator(FirstTarget);
TargetRegistry::iterator TargetRegistry::begin() {
return iterator(FirstTarget);
@@
-29,7
+29,7
@@
const Target *TargetRegistry::lookupTarget(const std::string &ArchName,
// Allocate target machine. First, check whether the user has explicitly
// specified an architecture to compile for. If so we have to look it up by
// name, because it might be a backend that has no mapping to a target triple.
// Allocate target machine. First, check whether the user has explicitly
// specified an architecture to compile for. If so we have to look it up by
// name, because it might be a backend that has no mapping to a target triple.
- const Target *TheTarget =
0
;
+ const Target *TheTarget =
nullptr
;
if (!ArchName.empty()) {
for (TargetRegistry::iterator it = TargetRegistry::begin(),
ie = TargetRegistry::end(); it != ie; ++it) {
if (!ArchName.empty()) {
for (TargetRegistry::iterator it = TargetRegistry::begin(),
ie = TargetRegistry::end(); it != ie; ++it) {
@@
-41,7
+41,7
@@
const Target *TargetRegistry::lookupTarget(const std::string &ArchName,
if (!TheTarget) {
Error = "error: invalid target '" + ArchName + "'.\n";
if (!TheTarget) {
Error = "error: invalid target '" + ArchName + "'.\n";
- return
0
;
+ return
nullptr
;
}
// Adjust the triple to match (if known), otherwise stick with the
}
// Adjust the triple to match (if known), otherwise stick with the
@@
-53,11
+53,11
@@
const Target *TargetRegistry::lookupTarget(const std::string &ArchName,
// Get the target specific parser.
std::string TempError;
TheTarget = TargetRegistry::lookupTarget(TheTriple.getTriple(), TempError);
// Get the target specific parser.
std::string TempError;
TheTarget = TargetRegistry::lookupTarget(TheTriple.getTriple(), TempError);
- if (
TheTarget == 0
) {
+ if (
!TheTarget
) {
Error = ": error: unable to get target for '"
+ TheTriple.getTriple()
+ "', see --version and --triple.\n";
Error = ": error: unable to get target for '"
+ TheTriple.getTriple()
+ "', see --version and --triple.\n";
- return
0
;
+ return
nullptr
;
}
}
}
}
@@
-69,16
+69,16
@@
const Target *TargetRegistry::lookupTarget(const std::string &TT,
// Provide special warning when no targets are initialized.
if (begin() == end()) {
Error = "Unable to find target for this triple (no targets are registered)";
// Provide special warning when no targets are initialized.
if (begin() == end()) {
Error = "Unable to find target for this triple (no targets are registered)";
- return
0
;
+ return
nullptr
;
}
}
- const Target *Matching =
0
;
+ const Target *Matching =
nullptr
;
Triple::ArchType Arch = Triple(TT).getArch();
for (iterator it = begin(), ie = end(); it != ie; ++it) {
if (it->ArchMatchFn(Arch)) {
if (Matching) {
Error = std::string("Cannot choose between targets \"") +
Matching->Name + "\" and \"" + it->Name + "\"";
Triple::ArchType Arch = Triple(TT).getArch();
for (iterator it = begin(), ie = end(); it != ie; ++it) {
if (it->ArchMatchFn(Arch)) {
if (Matching) {
Error = std::string("Cannot choose between targets \"") +
Matching->Name + "\" and \"" + it->Name + "\"";
- return
0
;
+ return
nullptr
;
}
Matching = &*it;
}
}
Matching = &*it;
}
@@
-87,7
+87,7
@@
const Target *TargetRegistry::lookupTarget(const std::string &TT,
if (!Matching) {
Error = "No available targets are compatible with this triple, "
"see -version for the available targets.";
if (!Matching) {
Error = "No available targets are compatible with this triple, "
"see -version for the available targets.";
- return
0
;
+ return
nullptr
;
}
return Matching;
}
return Matching;
@@
-116,15
+116,9
@@
void TargetRegistry::RegisterTarget(Target &T,
T.HasJIT = HasJIT;
}
T.HasJIT = HasJIT;
}
-const Target *TargetRegistry::getClosestTargetForJIT(std::string &Error) {
- const Target *TheTarget = lookupTarget(sys::getDefaultTargetTriple(), Error);
-
- if (TheTarget && !TheTarget->hasJIT()) {
- Error = "No JIT compatible target available for this host";
- return 0;
- }
-
- return TheTarget;
+static int TargetArraySortFn(const std::pair<StringRef, const Target *> *LHS,
+ const std::pair<StringRef, const Target *> *RHS) {
+ return LHS->first.compare(RHS->first);
}
void TargetRegistry::printRegisteredTargetsForVersion() {
}
void TargetRegistry::printRegisteredTargetsForVersion() {
@@
-136,11
+130,7
@@
void TargetRegistry::printRegisteredTargetsForVersion() {
Targets.push_back(std::make_pair(I->getName(), &*I));
Width = std::max(Width, Targets.back().first.size());
}
Targets.push_back(std::make_pair(I->getName(), &*I));
Width = std::max(Width, Targets.back().first.size());
}
- array_pod_sort(Targets.begin(), Targets.end(),
- [](const std::pair<StringRef, const Target *> *LHS,
- const std::pair<StringRef, const Target *> *RHS) {
- return LHS->first.compare(RHS->first);
- });
+ array_pod_sort(Targets.begin(), Targets.end(), TargetArraySortFn);
raw_ostream &OS = outs();
OS << " Registered Targets:\n";
raw_ostream &OS = outs();
OS << " Registered Targets:\n";