From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Fri, 1 Jul 2011 04:40:50 +0000 (+0000)
Subject: Fix use after free.
X-Git-Tag: android-x86-6.0-r1~952^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3f9b9eb57dafc2a25a6e3d9ee570bd5a884b11e3;p=android-x86%2Fexternal-llvm.git

Fix use after free.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134234 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/MC/SubtargetFeature.h b/include/llvm/MC/SubtargetFeature.h
index ff726ecab62..fccff031267 100644
--- a/include/llvm/MC/SubtargetFeature.h
+++ b/include/llvm/MC/SubtargetFeature.h
@@ -77,7 +77,7 @@ public:
   explicit SubtargetFeatures(const StringRef Initial = "");
 
   /// Features string accessors.
-  StringRef getString() const;
+  std::string getString() const;
 
   /// Adding Features.
   void AddFeature(const StringRef String, bool IsEnabled = true);
diff --git a/lib/MC/SubtargetFeature.cpp b/lib/MC/SubtargetFeature.cpp
index 247f73a6c0d..c930baf1bad 100644
--- a/lib/MC/SubtargetFeature.cpp
+++ b/lib/MC/SubtargetFeature.cpp
@@ -182,7 +182,7 @@ SubtargetFeatures::SubtargetFeatures(const StringRef Initial) {
 }
 
 
-StringRef SubtargetFeatures::getString() const {
+std::string SubtargetFeatures::getString() const {
   return Join(Features);
 }