averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Serialization] Wrap up serialization options into a class.

Browse Source 
No functionality change.

Swift SVN r21542
This commit is contained in:
Jordan Rose
2014-08-28 21:35:57 +00:00
parent 6d5094bacb
commit 90c76906bd
5 changed files with 78 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/Serialization/Serialization.cpp
View File

@@ -10,7 +10,6 @@
//
//===----------------------------------------------------------------------===//
#include "swift/Serialization/ModuleFormat.h"
#include "Serialization.h"
#include "SILFormat.h"
#include "swift/AST/AST.h"
@@ -27,6 +26,7 @@
#include "swift/ClangImporter/ClangImporter.h"
#include "swift/ClangImporter/ClangModule.h"
#include "swift/Serialization/BCRecordLayout.h"
#include "swift/Serialization/SerializationOptions.h"
#include "clang/Basic/Module.h"
@@ -2963,10 +2963,8 @@ Serializer::Serializer(const unsigned char (&signature)[N],
void Serializer::writeToStream(raw_ostream &os, ModuleOrSourceFile DC,
const SILModule *SILMod, bool serializeAllSIL,
FilenamesTy inputFiles, StringRef importedHeader,
StringRef moduleLinkName,
bool autolinkForceLoad) {
const SILModule *SILMod,
const SerializationOptions &options) {
Serializer S{MODULE_SIGNATURE, DC};
// FIXME: This is only really needed for debugging. We don't actually use it.
@@ -2975,9 +2973,9 @@ void Serializer::writeToStream(raw_ostream &os, ModuleOrSourceFile DC,
{
BCBlockRAII moduleBlock(S.Out, MODULE_BLOCK_ID, 2);
S.writeHeader();
S.writeInputFiles(inputFiles, importedHeader, moduleLinkName,
autolinkForceLoad);
S.writeSIL(SILMod, serializeAllSIL);
S.writeInputFiles(options.InputFilenames, options.ImportedHeader,
options.ModuleLinkName, options.AutolinkForceLoad);
S.writeSIL(SILMod, options.SerializeAllSIL);
S.writeAST(DC);
}
@@ -3004,33 +3002,31 @@ void Serializer::writeDocToStream(raw_ostream &os, ModuleOrSourceFile DC) {
S.writeToStream(os);
}
void swift::serialize(ModuleOrSourceFile DC, const char *outputPath,
const char *docOutputPath,
const SILModule *M, bool serializeAllSIL,
FilenamesTy inputFiles, StringRef importedHeader,
StringRef moduleLinkName, bool autolinkForceLoad) {
assert(outputPath && outputPath[0] != '\0');
void swift::serialize(ModuleOrSourceFile DC,
const SerializationOptions &options,
const SILModule *M) {
assert(options.OutputPath && options.OutputPath[0] != '\0');
std::error_code EC;
llvm::raw_fd_ostream out(outputPath, EC, llvm::sys::fs::F_None);
llvm::raw_fd_ostream out(options.OutputPath, EC, llvm::sys::fs::F_None);
if (out.has_error() || EC) {
getContext(DC).Diags.diagnose(SourceLoc(), diag::error_opening_output,
outputPath, EC.message());
options.OutputPath, EC.message());
out.clear_error();
return;
}
Serializer::writeToStream(out, DC, M, serializeAllSIL, inputFiles,
importedHeader, moduleLinkName, autolinkForceLoad);
Serializer::writeToStream(out, DC, M, options);
if (docOutputPath && docOutputPath[0] != '\0') {
if (options.DocOutputPath && options.DocOutputPath[0] != '\0') {
std::error_code EC;
llvm::raw_fd_ostream docOut(docOutputPath, EC, llvm::sys::fs::F_None);
llvm::raw_fd_ostream docOut(options.DocOutputPath, EC,
llvm::sys::fs::F_None);
if (docOut.has_error() || EC) {
getContext(DC).Diags.diagnose(SourceLoc(), diag::error_opening_output,
docOutputPath, EC.message());
options.DocOutputPath, EC.message());
docOut.clear_error();
return;
}