Merge commit 'f3eb161c785a' from apple/stable/20200108 into swift/release/5.3

git apple-llvm automerger · git apple-llvm automerger · commit cb3dbcba9093 · 2020-05-11T13:51:49.000-07:00
diff --git a/llvm/include/llvm/MC/SubtargetFeature.h b/llvm/include/llvm/MC/SubtargetFeature.h
@@ -214,7 +214,7 @@ class SubtargetFeatures {
   }
 
   /// Return string stripped of flag.
-  static std::string StripFlag(StringRef Feature) {
+  static StringRef StripFlag(StringRef Feature) {
     return hasFlag(Feature) ? Feature.substr(1) : Feature;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ class SubtargetFeatures {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`/// Return string stripped of flag.`
`217`		`- static std::string StripFlag(StringRef Feature) {`
	`217`	`+ static StringRef StripFlag(StringRef Feature) {`
`218`	`218`	`return hasFlag(Feature) ? Feature.substr(1) : Feature;`
`219`	`219`	`}`
`220`	`220`