From 1a93285c686a4ad6e4311f55898cb116ca51b5b0 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 14 Feb 2020 15:23:42 -0800 Subject: [PATCH] Fix -Wstring-compare warnings in new OpenMP code --- llvm/lib/Frontend/OpenMP/OMPContext.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Frontend/OpenMP/OMPContext.cpp b/llvm/lib/Frontend/OpenMP/OMPContext.cpp index f4c4bdf..244448c 100644 --- a/llvm/lib/Frontend/OpenMP/OMPContext.cpp +++ b/llvm/lib/Frontend/OpenMP/OMPContext.cpp @@ -411,7 +411,7 @@ bool llvm::omp::isValidTraitPropertyForTraitSetAndSelector( std::string llvm::omp::listOpenMPContextTraitSets() { std::string S; #define OMP_TRAIT_SET(Enum, Str) \ - if (Str != "invalid") \ + if (StringRef(Str) != "invalid") \ S.append("'").append(Str).append("'").append(" "); #include "llvm/Frontend/OpenMP/OMPKinds.def" S.pop_back(); @@ -421,7 +421,7 @@ std::string llvm::omp::listOpenMPContextTraitSets() { std::string llvm::omp::listOpenMPContextTraitSelectors(TraitSet Set) { std::string S; #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(" "); #include "llvm/Frontend/OpenMP/OMPKinds.def" S.pop_back(); @@ -434,7 +434,8 @@ llvm::omp::listOpenMPContextTraitProperties(TraitSet Set, std::string S; #define OMP_TRAIT_PROPERTY(Enum, TraitSetEnum, TraitSelectorEnum, Str) \ if (TraitSet::TraitSetEnum == Set && \ - TraitSelector::TraitSelectorEnum == Selector && Str != "invalid") \ + TraitSelector::TraitSelectorEnum == Selector && \ + StringRef(Str) != "invalid") \ S.append("'").append(Str).append("'").append(" "); #include "llvm/Frontend/OpenMP/OMPKinds.def" S.pop_back(); -- 2.7.4