Author: echristo
Date: Fri Oct 9 13:39:55 2015
New Revision: 249871
URL: http://llvm.org/viewvc/llvm-project?rev=249871&view=rev
Log:
constify the feature vector going into initFeatureMap as it shouldn't
change the set of features.
Modified:
cfe/trunk/include/clang/Basic/TargetInfo.h
cfe/trunk/lib/Basic/TargetInfo.cpp
cfe/trunk/lib/Basic/Targets.cpp
Modified: cfe/trunk/include/clang/Basic/TargetInfo.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TargetInfo.h?rev=249871&r1=249870&r2=249871&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/TargetInfo.h (original)
+++ cfe/trunk/include/clang/Basic/TargetInfo.h Fri Oct 9 13:39:55 2015
@@ -753,7 +753,7 @@ public:
/// \return False on error (invalid features).
virtual bool initFeatureMap(llvm::StringMap<bool> &Features,
DiagnosticsEngine &Diags, StringRef CPU,
- std::vector<std::string> &FeatureVec) const;
+ const std::vector<std::string> &FeatureVec)
const;
/// \brief Get the ABI currently in use.
virtual StringRef getABI() const { return StringRef(); }
Modified: cfe/trunk/lib/Basic/TargetInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/TargetInfo.cpp?rev=249871&r1=249870&r2=249871&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/TargetInfo.cpp (original)
+++ cfe/trunk/lib/Basic/TargetInfo.cpp Fri Oct 9 13:39:55 2015
@@ -312,9 +312,9 @@ void TargetInfo::adjust(const LangOption
}
}
-bool TargetInfo::initFeatureMap(llvm::StringMap<bool> &Features,
- DiagnosticsEngine &Diags, StringRef CPU,
- std::vector<std::string> &FeatureVec) const {
+bool TargetInfo::initFeatureMap(
+ llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU,
+ const std::vector<std::string> &FeatureVec) const {
for (const auto &F : FeatureVec) {
const char *Name = F.c_str();
// Apply the feature via the target.
Modified: cfe/trunk/lib/Basic/Targets.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=249871&r1=249870&r2=249871&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Fri Oct 9 13:39:55 2015
@@ -887,9 +887,10 @@ public:
void getTargetDefines(const LangOptions &Opts,
MacroBuilder &Builder) const override;
- bool initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine
&Diags,
- StringRef CPU,
- std::vector<std::string> &FeaturesVec) const override;
+ bool
+ initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags,
+ StringRef CPU,
+ const std::vector<std::string> &FeaturesVec) const override;
bool handleTargetFeatures(std::vector<std::string> &Features,
DiagnosticsEngine &Diags) override;
@@ -1253,7 +1254,7 @@ void PPCTargetInfo::getTargetDefines(con
// go ahead and error since the customer has expressed a somewhat incompatible
// set of options.
static bool ppcUserFeaturesCheck(DiagnosticsEngine &Diags,
- std::vector<std::string> &FeaturesVec) {
+ const std::vector<std::string> &FeaturesVec) {
if (std::find(FeaturesVec.begin(), FeaturesVec.end(), "-vsx") !=
FeaturesVec.end()) {
@@ -1275,9 +1276,9 @@ static bool ppcUserFeaturesCheck(Diagnos
return true;
}
-bool PPCTargetInfo::initFeatureMap(llvm::StringMap<bool> &Features,
- DiagnosticsEngine &Diags, StringRef CPU,
- std::vector<std::string> &FeaturesVec)
const {
+bool PPCTargetInfo::initFeatureMap(
+ llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU,
+ const std::vector<std::string> &FeaturesVec) const {
Features["altivec"] = llvm::StringSwitch<bool>(CPU)
.Case("7400", true)
.Case("g4", true)
@@ -2400,9 +2401,10 @@ public:
// initFeatureMap which calls this repeatedly.
static void setFeatureEnabledImpl(llvm::StringMap<bool> &Features,
StringRef Name, bool Enabled);
- bool initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine
&Diags,
- StringRef CPU,
- std::vector<std::string> &FeaturesVec) const override;
+ bool
+ initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags,
+ StringRef CPU,
+ const std::vector<std::string> &FeaturesVec) const override;
bool hasFeature(StringRef Feature) const override;
bool handleTargetFeatures(std::vector<std::string> &Features,
DiagnosticsEngine &Diags) override;
@@ -2530,7 +2532,7 @@ bool X86TargetInfo::setFPMath(StringRef
bool X86TargetInfo::initFeatureMap(
llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU,
- std::vector<std::string> &FeaturesVec) const {
+ const std::vector<std::string> &FeaturesVec) const {
// FIXME: This *really* should not be here.
// X86_64 always has SSE2.
if (getTriple().getArch() == llvm::Triple::x86_64)
@@ -4427,10 +4429,11 @@ public:
}
// FIXME: This should be based on Arch attributes, not CPU names.
- bool initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine
&Diags,
- StringRef CPU,
- std::vector<std::string> &FeaturesVec) const override {
-
+ bool
+ initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags,
+ StringRef CPU,
+ const std::vector<std::string> &FeaturesVec) const override {
+
std::vector<const char*> TargetFeatures;
// get default FPU features
@@ -5936,9 +5939,10 @@ public:
return CPUKnown;
}
- bool initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine
&Diags,
- StringRef CPU,
- std::vector<std::string> &FeaturesVec) const override {
+ bool
+ initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags,
+ StringRef CPU,
+ const std::vector<std::string> &FeaturesVec) const override {
if (CPU == "zEC12")
Features["transactional-execution"] = true;
if (CPU == "z13") {
@@ -6305,9 +6309,10 @@ public:
.Default(false);
}
const std::string& getCPU() const { return CPU; }
- bool initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine
&Diags,
- StringRef CPU,
- std::vector<std::string> &FeaturesVec) const override {
+ bool
+ initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags,
+ StringRef CPU,
+ const std::vector<std::string> &FeaturesVec) const override {
if (CPU == "octeon")
Features["mips64r2"] = Features["cnmips"] = true;
else
@@ -6985,9 +6990,10 @@ protected:
}
private:
- bool initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine
&Diags,
- StringRef CPU,
- std::vector<std::string> &FeaturesVec) const override {
+ bool
+ initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags,
+ StringRef CPU,
+ const std::vector<std::string> &FeaturesVec) const override {
if (CPU == "bleeding-edge")
Features["simd128"] = true;
return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
