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

[frontend] Removed the separate TargetOptions class.

Browse Source 
TargetOptions only contained the target triple, which was duplicated in
IRGenOptions. These could get out-of-sync, which would cause issues during
IRGen. Since nothing was using TargetOptions other than CompilerInvocation,
removed TargetOptions in favor of making IRGenOptions the canonical home of the
target triple.

Swift SVN r12869
This commit is contained in:
Connor Wakamo
2014-01-23 19:07:55 +00:00
parent b35b8451f4
commit 552558d03f
3 changed files with 8 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Frontend/CompilerInvocation.cpp
View File

@@ -28,7 +28,7 @@ using namespace swift::driver;
using namespace llvm::opt;
swift::CompilerInvocation::CompilerInvocation() {
TargetOpts.Triple = llvm::sys::getDefaultTargetTriple();
IRGenOpts.Triple = llvm::sys::getDefaultTargetTriple();
}
void CompilerInvocation::setMainExecutablePath(StringRef Path) {
@@ -48,14 +48,14 @@ void CompilerInvocation::setRuntimeIncludePath(StringRef Path) {
void CompilerInvocation::updateRuntimeImportPath() {
llvm::SmallString<128> LibPath(SearchPathOpts.RuntimeIncludePath);
llvm::Triple Triple(TargetOpts.Triple);
llvm::Triple Triple(IRGenOpts.Triple);
llvm::sys::path::append(LibPath, getPlatformNameForTriple(Triple));
SearchPathOpts.RuntimeImportPath = LibPath.str();
}
void CompilerInvocation::setTargetTriple(StringRef Triple) {
TargetOpts.Triple = Triple.str();
IRGenOpts.Triple = Triple.str();
updateRuntimeImportPath();
}
@@ -365,17 +365,6 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts, ArgList &Args,
return false;
}
static bool ParseTargetArgs(TargetOptions &Opts, ArgList &Args,
DiagnosticEngine &Diags) {
using namespace options;
if (const Arg *A = Args.getLastArg(OPT_target)) {
Opts.Triple = llvm::Triple::normalize(A->getValue());
}
return false;
}
static bool ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
DiagnosticEngine &Diags) {
using namespace options;
@@ -486,16 +475,16 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
Opts.EnableDynamicValueTypeLayout = true;
}
if (const Arg *A = Args.getLastArg(OPT_target)) {
Opts.Triple = llvm::Triple::normalize(A->getValue());
}
// TODO: investigate whether these should be removed, in favor of definitions
// in other classes.
if (!FrontendOpts.InputFilenames.empty())
Opts.MainInputFilename = FrontendOpts.InputFilenames[0];
Opts.OutputFilename = FrontendOpts.OutputFilename;
if (const Arg *A = Args.getLastArg(OPT_target)) {
Opts.Triple = A->getValue();
}
return false;
}
@@ -544,10 +533,6 @@ bool CompilerInvocation::parseArgs(ArrayRef<const char *> Args,
if (ParseSearchPathArgs(SearchPathOpts, *ParsedArgs, Diags)) {
return true;
}
if (ParseTargetArgs(TargetOpts, *ParsedArgs, Diags)) {
return true;
}
if (ParseIRGenArgs(IRGenOpts, *ParsedArgs, Diags, FrontendOpts,
getSDKPath())) {