Author: echristo
Date: Tue Sep 1 17:37:03 2015
New Revision: 246598
URL: http://llvm.org/viewvc/llvm-project?rev=246598&view=rev
Log:
Revert "Migrate the target attribute parsing code into an extension off of"
This is failing in release mode. Revert while I figure out what's happening.
This reverts commit r246596.
Modified:
cfe/trunk/include/clang/Basic/Attr.td
cfe/trunk/lib/CodeGen/CGCall.cpp
Modified: cfe/trunk/include/clang/Basic/Attr.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Attr.td?rev=246598&r1=246597&r2=246598&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Attr.td (original)
+++ cfe/trunk/include/clang/Basic/Attr.td Tue Sep 1 17:37:03 2015
@@ -1315,54 +1315,9 @@ def Pascal : InheritableAttr {
def Target : InheritableAttr {
let Spellings = [GCC<"target">];
- let Args = [StringArgument<"featuresStr">];
+ let Args = [StringArgument<"features">];
let Subjects = SubjectList<[Function], ErrorDiag>;
let Documentation = [TargetDocs];
- let AdditionalMembers = [{
- StringRef CPU;
- std::vector<std::string> Features;
- bool Parsed;
- StringRef getCPU() {
- if (!Parsed)
- parse();
- return CPU;
- }
- std::vector<std::string> &getFeatures() {
- if (!Parsed)
- parse();
- return Features;
- }
- void parse() {
- StringRef FeaturesStr = getFeaturesStr();
- SmallVector<StringRef, 1> AttrFeatures;
- FeaturesStr.split(AttrFeatures, ",");
-
- // Grab the various features and prepend a "+" to turn on the feature to
- // the backend and add them to our existing set of features.
- for (auto &Feature : AttrFeatures) {
- // Go ahead and trim whitespace rather than either erroring or
- // accepting it weirdly.
- Feature = Feature.trim();
-
- // While we're here iterating check for a different target cpu.
- if (Feature.startswith("arch="))
- CPU = Feature.split("=").second.trim();
- else if (Feature.startswith("tune="))
- // We don't support cpu tuning this way currently.
- ;
- else if (Feature.startswith("fpmath="))
- // TODO: Support the fpmath option this way. It will require checking
- // overall feature validity for the function with the rest of the
- // attributes on the function.
- ;
- else if (Feature.startswith("no-"))
- Features.push_back("-" + Feature.split("-").second.str());
- else
- Features.push_back("+" + Feature.str());
- }
- Parsed = true;
- }
- }];
}
def TransparentUnion : InheritableAttr {
Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=246598&r1=246597&r2=246598&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCall.cpp Tue Sep 1 17:37:03 2015
@@ -1499,19 +1499,40 @@ void CodeGenModule::ConstructAttributeLi
const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(TargetDecl);
if (FD && FD->hasAttr<TargetAttr>()) {
llvm::StringMap<bool> FeatureMap;
- auto *TD = FD->getAttr<TargetAttr>();
+ const auto *TD = FD->getAttr<TargetAttr>();
// Make a copy of the features as passed on the command line.
std::vector<std::string> FnFeatures =
getTarget().getTargetOpts().FeaturesAsWritten;
- std::vector<std::string> &AttrFeatures = TD->getFeatures();
- std::copy(AttrFeatures.begin(), AttrFeatures.end(),
- std::back_inserter(FnFeatures));
+ // Grab the target attribute string.
+ StringRef FeaturesStr = TD->getFeatures();
+ SmallVector<StringRef, 1> AttrFeatures;
+ FeaturesStr.split(AttrFeatures, ",");
- if (TD->getCPU() != "")
- TargetCPU = TD->getCPU();
+ // Grab the various features and prepend a "+" to turn on the feature to
+ // the backend and add them to our existing set of features.
+ for (auto &Feature : AttrFeatures) {
+ // Go ahead and trim whitespace rather than either erroring or
+ // accepting it weirdly.
+ Feature = Feature.trim();
+ // While we're here iterating check for a different target cpu.
+ if (Feature.startswith("arch="))
+ TargetCPU = Feature.split("=").second.trim();
+ else if (Feature.startswith("tune="))
+ // We don't support cpu tuning this way currently.
+ ;
+ else if (Feature.startswith("fpmath="))
+ // TODO: Support the fpmath option this way. It will require checking
+ // overall feature validity for the function with the rest of the
+ // attributes on the function.
+ ;
+ else if (Feature.startswith("no-"))
+ FnFeatures.push_back("-" + Feature.split("-").second.str());
+ else
+ FnFeatures.push_back("+" + Feature.str());
+ }
// Now populate the feature map, first with the TargetCPU which is either
// the default or a new one from the target attribute string. Then we'll
// use the passed in features (FeaturesAsWritten) along with the new ones
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
