From 00b09c723cb7395af6a7d15cb1997e612ccabc37 Mon Sep 17 00:00:00 2001 From: Michael Forster Date: Mon, 20 Apr 2020 09:18:57 +0200 Subject: [PATCH] More StringRef -> std::string conversion fixes. This is needed for the master-next branch. --- tools/swift-api-digester/swift-api-digester.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/swift-api-digester/swift-api-digester.cpp b/tools/swift-api-digester/swift-api-digester.cpp index 5ce91e36b96b2..bb31a5217d403 100644 --- a/tools/swift-api-digester/swift-api-digester.cpp +++ b/tools/swift-api-digester/swift-api-digester.cpp @@ -2676,13 +2676,13 @@ static std::string getDefaultBaselineDir(const char *Main) { llvm::sys::path::remove_filename(BaselineDir); // Remove /swift-api-digester llvm::sys::path::remove_filename(BaselineDir); // Remove /bin llvm::sys::path::append(BaselineDir, "lib", "swift", "FrameworkABIBaseline"); - return BaselineDir.str(); + return BaselineDir.str().str(); } static std::string getEmptyBaselinePath(const char *Main) { llvm::SmallString<128> BaselinePath(getDefaultBaselineDir(Main)); llvm::sys::path::append(BaselinePath, "nil.json"); - return BaselinePath.str(); + return BaselinePath.str().str(); } static StringRef getBaselineFilename(llvm::Triple Triple) { @@ -2710,13 +2710,13 @@ static std::string getDefaultBaselinePath(const char *Main, StringRef Module, // Look for ABI or API baseline llvm::sys::path::append(BaselinePath, ABI? "ABI": "API"); llvm::sys::path::append(BaselinePath, getBaselineFilename(Triple)); - return BaselinePath.str(); + return BaselinePath.str().str(); } static std::string getCustomBaselinePath(llvm::Triple Triple) { llvm::SmallString<128> BaselinePath(options::BaselineDirPath); llvm::sys::path::append(BaselinePath, getBaselineFilename(Triple)); - return BaselinePath.str(); + return BaselinePath.str().str(); } static SDKNodeRoot *getBaselineFromJson(const char *Main, SDKContext &Ctx) {