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

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

Browse Source
This commit is contained in:
swift-ci
2017-07-25 22:09:00 -07:00
parent 96ba5e601a 053aea79d2
commit 6d7415e0da
5 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1343,7 +1343,8 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
IRGenOptions &IRGenOpts,
FrontendOptions &FEOpts,
DiagnosticEngine &Diags,
const llvm::Triple &Triple) {
const llvm::Triple &Triple,
ClangImporterOptions &ClangOpts) {
using namespace options;
if (const Arg *A = Args.getLastArg(OPT_sil_inline_threshold)) {
@@ -1399,6 +1400,10 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
IRGenOpts.Optimize = true;
Opts.Optimization = SILOptions::SILOptMode::Optimize;
}
if (IRGenOpts.Optimize) {
ClangOpts.Optimization = "-Os";
}
}
if (Args.getLastArg(OPT_AssumeSingleThreaded)) {
@@ -1782,7 +1787,7 @@ bool CompilerInvocation::parseArgs(ArrayRef<const char *> Args,
}
if (ParseSILArgs(SILOpts, ParsedArgs, IRGenOpts, FrontendOpts, Diags,
LangOpts.Target)) {
LangOpts.Target, ClangImporterOpts)) {
return true;
}