Merge pull request #30403 from MForster/forster/string-fixes

Cherry-pick StringRef->std::string conversion fixes into `master`
This commit is contained in:
Dmitri Gribenko
2020-03-17 12:09:36 +01:00
committed by GitHub
107 changed files with 363 additions and 344 deletions

View File

@@ -217,7 +217,7 @@ static void initTraceInfoImpl(trace::SwiftInvocation &SwiftArgs,
ArrayRef<Str> Args) {
llvm::raw_string_ostream OS(SwiftArgs.Args.Arguments);
interleave(Args, [&OS](StringRef arg) { OS << arg; }, [&OS] { OS << ' '; });
SwiftArgs.Args.PrimaryFile = InputFile;
SwiftArgs.Args.PrimaryFile = InputFile.str();
}
void trace::initTraceInfo(trace::SwiftInvocation &SwiftArgs,