Skip to content

More StringRef -> std::string conversion fixes. #31148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2020
Merged

More StringRef -> std::string conversion fixes. #31148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/swift-api-digester/swift-api-digester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down