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

Taking Jordan's suggestions.

Browse Source
This commit is contained in:
David Ungar
2017-12-01 17:39:08 -08:00
parent ccb73783dc
commit df21c6c266
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Frontend/CompilerInvocation.cpp
View File

@@ -640,7 +640,7 @@ bool FrontendArgsToOptionsConverter::computeModuleName() {
(Opts.ModuleName != STDLIB_NAME || Opts.ParseStdlib)) {
return false;
}
if (FrontendOptions::doesActionImplyMainModule(Opts.RequestedAction) ||
if (!FrontendOptions::needsProperModuleName(Opts.RequestedAction) ||
Opts.isCompilingExactlyOneSwiftFile()) {
Opts.ModuleName = "main";
return false;
@@ -681,8 +681,9 @@ bool FrontendArgsToOptionsConverter::computeFallbackModuleName() {
}
bool FrontendArgsToOptionsConverter::computeOutputFilenames() {
assert(Opts.OutputFilenames.empty() &&
"Output filename should not be set at this point");
if (!FrontendOptions::doesActionProduceOutput(Opts.RequestedAction)) {
Opts.OutputFilenames.clear();
return false;
}
ArrayRef<std::string> outputFilenamesFromCommandLineOrFilelist =