[SR-3063] Suppress SIL transforms when merging modules.

This commit is contained in:
John McCall
2017-07-26 21:19:07 -04:00
parent 6b2a92222e
commit dda3a3827c
9 changed files with 31 additions and 11 deletions

View File

@@ -35,6 +35,7 @@ bool FrontendOptions::actionHasOutput() const {
case EmitSIBGen:
case EmitSIB:
case EmitModuleOnly:
case MergeModules:
return true;
case Immediate:
case REPL:
@@ -68,6 +69,7 @@ bool FrontendOptions::actionIsImmediate() const {
case EmitSIBGen:
case EmitSIB:
case EmitModuleOnly:
case MergeModules:
return false;
case Immediate:
case REPL:
@@ -85,7 +87,8 @@ bool FrontendOptions::actionIsImmediate() const {
void FrontendOptions::forAllOutputPaths(
std::function<void(const std::string &)> fn) const {
if (RequestedAction != FrontendOptions::EmitModuleOnly) {
if (RequestedAction != FrontendOptions::EmitModuleOnly &&
RequestedAction != FrontendOptions::MergeModules) {
for (const std::string &OutputFileName : OutputFilenames) {
fn(OutputFileName);
}