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

[Bitcode Driver] implement whitelist of compiler options for Swift.

Browse Source 
Only white-listed options are allowed to be embedded.

This commit only affects embed_bitcode option.

rdar://20040420


Swift SVN r28004
This commit is contained in:
Manman Ren
2015-04-30 23:11:00 +00:00
parent 26b3f386e0
commit 142f41ffb2
1 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/Driver/Tools.cpp
View File

@@ -313,6 +313,51 @@ Job *Swift::constructJob(const JobAction &JA, std::unique_ptr<JobList> Inputs,
} }
} }
// Only white-listed flags below are allowed to be embedded.
if (Args.hasArg(options::OPT_embed_bitcode) &&
isa<BackendJobAction>(JA)) {
Arguments.push_back("-target");
std::string TripleStr = getToolChain().getTripleString();
Arguments.push_back(Args.MakeArgString(TripleStr));
const llvm::Triple &Triple = getToolChain().getTriple();
// Enable address top-byte ignored in the ARM64 backend.
if (Triple.getArch() == llvm::Triple::aarch64) {
Arguments.push_back("-Xllvm");
Arguments.push_back("-aarch64-use-tbi");
}
// Handle the CPU and its preferences.
if (auto arg = Args.getLastArg(options::OPT_target_cpu))
arg->render(Args, Arguments);
// Pass through any subsystem flags.
Args.AddAllArgs(Arguments, options::OPT_Xllvm);
Args.AddAllArgs(Arguments, options::OPT_Xcc);
// Pass the optimization level down to the frontend.
Args.AddLastArg(Arguments, options::OPT_O_Group);
Arguments.push_back("-module-name");
Arguments.push_back(Args.MakeArgString(OI.ModuleName));
// Add the output file argument if necessary.
if (Output->getPrimaryOutputType() != types::TY_Nothing) {
for (const std::string &FileName : Output->getPrimaryOutputFilenames()) {
Arguments.push_back("-o");
Arguments.push_back(FileName.c_str());
}
}
// Add flags implied by -embed-bitcode.
Arguments.push_back("-embed-bitcode");
// Disable all llvm IR level optimizations.
Arguments.push_back("-disable-llvm-optzns");
return new Job(JA, *this, std::move(Inputs), std::move(Output), Exec,
Arguments);
}
if (Args.hasArg(options::OPT_parse_stdlib)) if (Args.hasArg(options::OPT_parse_stdlib))
Arguments.push_back("-disable-objc-attr-requires-foundation-module"); Arguments.push_back("-disable-objc-attr-requires-foundation-module");
@@ -405,14 +450,6 @@ Job *Swift::constructJob(const JobAction &JA, std::unique_ptr<JobList> Inputs,
if (OI.CompilerMode == OutputInfo::Mode::Immediate) if (OI.CompilerMode == OutputInfo::Mode::Immediate)
Args.AddLastArg(Arguments, options::OPT__DASH_DASH); Args.AddLastArg(Arguments, options::OPT__DASH_DASH);
if (Args.hasArg(options::OPT_embed_bitcode) &&
isa<BackendJobAction>(JA)) {
// Add flags implied by -embed-bitcode.
Arguments.push_back("-embed-bitcode");
// Disable all llvm IR level optimizations.
Arguments.push_back("-disable-llvm-optzns");
}
if (Args.hasArg(options::OPT_embed_bitcode_marker)) if (Args.hasArg(options::OPT_embed_bitcode_marker))
Arguments.push_back("-embed-bitcode-marker"); Arguments.push_back("-embed-bitcode-marker");