Fix -Wstring-compare warnings in new OpenMP code

This commit is contained in:
Reid Kleckner 2020-02-14 15:23:42 -08:00
parent 859654c065
commit 1a93285c68

View File

@ -411,7 +411,7 @@ bool llvm::omp::isValidTraitPropertyForTraitSetAndSelector(
std::string llvm::omp::listOpenMPContextTraitSets() { std::string llvm::omp::listOpenMPContextTraitSets() {
std::string S; std::string S;
#define OMP_TRAIT_SET(Enum, Str) \ #define OMP_TRAIT_SET(Enum, Str) \
if (Str != "invalid") \ if (StringRef(Str) != "invalid") \
S.append("'").append(Str).append("'").append(" "); S.append("'").append(Str).append("'").append(" ");
#include "llvm/Frontend/OpenMP/OMPKinds.def" #include "llvm/Frontend/OpenMP/OMPKinds.def"
S.pop_back(); S.pop_back();
@ -421,7 +421,7 @@ std::string llvm::omp::listOpenMPContextTraitSets() {
std::string llvm::omp::listOpenMPContextTraitSelectors(TraitSet Set) { std::string llvm::omp::listOpenMPContextTraitSelectors(TraitSet Set) {
std::string S; std::string S;
#define OMP_TRAIT_SELECTOR(Enum, TraitSetEnum, Str, ReqProp) \ #define OMP_TRAIT_SELECTOR(Enum, TraitSetEnum, Str, ReqProp) \
if (TraitSet::TraitSetEnum == Set && Str != "Invalid") \ if (TraitSet::TraitSetEnum == Set && StringRef(Str) != "Invalid") \
S.append("'").append(Str).append("'").append(" "); S.append("'").append(Str).append("'").append(" ");
#include "llvm/Frontend/OpenMP/OMPKinds.def" #include "llvm/Frontend/OpenMP/OMPKinds.def"
S.pop_back(); S.pop_back();
@ -434,7 +434,8 @@ llvm::omp::listOpenMPContextTraitProperties(TraitSet Set,
std::string S; std::string S;
#define OMP_TRAIT_PROPERTY(Enum, TraitSetEnum, TraitSelectorEnum, Str) \ #define OMP_TRAIT_PROPERTY(Enum, TraitSetEnum, TraitSelectorEnum, Str) \
if (TraitSet::TraitSetEnum == Set && \ if (TraitSet::TraitSetEnum == Set && \
TraitSelector::TraitSelectorEnum == Selector && Str != "invalid") \ TraitSelector::TraitSelectorEnum == Selector && \
StringRef(Str) != "invalid") \
S.append("'").append(Str).append("'").append(" "); S.append("'").append(Str).append("'").append(" ");
#include "llvm/Frontend/OpenMP/OMPKinds.def" #include "llvm/Frontend/OpenMP/OMPKinds.def"
S.pop_back(); S.pop_back();