diff options
| author | Nadav Rotem <nrotem@apple.com> | 2013-02-27 05:56:20 +0000 |
|---|---|---|
| committer | Nadav Rotem <nrotem@apple.com> | 2013-02-27 05:56:20 +0000 |
| commit | f8b80de1a952f14921c3137545e05575ea88e4ab (patch) | |
| tree | e356d5128f277e9dc956ddbe5ff75301fdf43614 /lib/Target/X86/X86Subtarget.cpp | |
| parent | f26b4f05b3fdd8618f75b8784388e8415a6eea0c (diff) | |
| download | llvm-f8b80de1a952f14921c3137545e05575ea88e4ab.tar.gz llvm-f8b80de1a952f14921c3137545e05575ea88e4ab.tar.bz2 llvm-f8b80de1a952f14921c3137545e05575ea88e4ab.tar.xz | |
Revert r176166 because it broke one of the lit tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@176171 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86Subtarget.cpp')
| -rw-r--r-- | lib/Target/X86/X86Subtarget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp index ec8733fba6..0f2c008ab9 100644 --- a/lib/Target/X86/X86Subtarget.cpp +++ b/lib/Target/X86/X86Subtarget.cpp @@ -332,9 +332,9 @@ void X86Subtarget::resetSubtargetFeatures(const MachineFunction *MF) { "target-cpu"); Attribute FSAttr = FnAttrs.getAttribute(AttributeSet::FunctionIndex, "target-features"); - StringRef CPU = - !CPUAttr.hasAttribute(Attribute::None) ? CPUAttr.getValueAsString() : ""; - StringRef FS = + std::string CPU = + !CPUAttr.hasAttribute(Attribute::None) ?CPUAttr.getValueAsString() : ""; + std::string FS = !FSAttr.hasAttribute(Attribute::None) ? FSAttr.getValueAsString() : ""; if (!FS.empty()) { initializeEnvironment(); @@ -343,7 +343,7 @@ void X86Subtarget::resetSubtargetFeatures(const MachineFunction *MF) { } void X86Subtarget::resetSubtargetFeatures(StringRef CPU, StringRef FS) { - StringRef CPUName = CPU; + std::string CPUName = CPU; if (!FS.empty() || !CPU.empty()) { if (CPUName.empty()) { #if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)\ |