Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
Joe Groff
2019-12-10 12:46:41 -08:00
642 changed files with 27717 additions and 11572 deletions

View File

@@ -371,6 +371,8 @@ public:
std::string getModuleOutputPathForAtMostOnePrimary() const;
std::string
getReferenceDependenciesFilePathForPrimary(StringRef filename) const;
std::string getSwiftRangesFilePathForPrimary(StringRef filename) const;
std::string getCompiledSourceFilePathForPrimary(StringRef filename) const;
std::string getSerializedDiagnosticsPathForAtMostOnePrimary() const;
/// TBDPath only makes sense in whole module compilation mode,
@@ -675,6 +677,16 @@ public:
getPrimarySpecificPathsForAtMostOnePrimary() const;
const PrimarySpecificPaths &
getPrimarySpecificPathsForSourceFile(const SourceFile &SF) const;
/// Write out the unparsed (delayed) source ranges
/// Return true for error
bool emitSwiftRanges(DiagnosticEngine &diags, SourceFile *primaryFile,
StringRef outputPath) const;
/// Return true for error
bool emitCompiledSource(DiagnosticEngine &diags,
const SourceFile *primaryFile,
StringRef outputPath) const;
};
} // namespace swift