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

[driver] Remove the 'swift-fixit' symlink and introduce '-emit-fixits-path' frontend option that

Browse Source 
writes compiler fixits as source edits.

Driver option '-fixit-code' adds '-emit-fixits-path' for all the frontend invocations.

Swift SVN r27208
This commit is contained in:
Argyrios Kyrtzidis
2015-04-10 17:33:29 +00:00
parent 4e6efcb617
commit 8b250d6d35
22 changed files with 176 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Driver/Driver.cpp
View File

@@ -93,8 +93,6 @@ void Driver::parseDriverKind(ArrayRef<const char *> Args) {
llvm::StringSwitch<Optional<DriverKind>>(DriverName)
.Case("swift", DriverKind::Interactive)
.Case("swiftc", DriverKind::Batch)
.Case("swift-fixit", DriverKind::FixCode)
.Case("swift-update", DriverKind::FixCode) // FIXME: remove once fully transitioned.
.Case("swift-autolink-extract", DriverKind::AutolinkExtract)
.Default(None);
@@ -309,7 +307,9 @@ std::unique_ptr<Compilation> Driver::buildCompilation(
// For updating code we need to go through all the files and pick up changes,
// even if they have compiler errors.
if (OI.CompilerMode == OutputInfo::Mode::UpdateCode)
// Also for getting bulk fixits.
if (OI.CompilerMode == OutputInfo::Mode::UpdateCode ||
OI.ShouldGenerateFixitEdits)
C->setContinueBuildingAfterErrors();
if (OFM)
@@ -674,10 +674,6 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
OI.CompilerMode = OutputInfo::Mode::UpdateCode;
OI.CompilerOutputType = types::TY_Remapping;
OI.LinkAction = LinkKind::None;
} else if (Args.hasArg(options::OPT_fixit_code)) {
OI.CompilerMode = OutputInfo::Mode::FixCode;
OI.CompilerOutputType = types::TY_Remapping;
OI.LinkAction = LinkKind::None;
} else {
diagnoseOutputModeArg(Diags, OutputModeArg, !Inputs.empty(), Args,
driverKind == DriverKind::Interactive, Name);
@@ -823,6 +819,10 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
}
}
if (Args.hasArg(options::OPT_fixit_code)) {
OI.ShouldGenerateFixitEdits = true;
}
{
if (const Arg *A = Args.getLastArg(options::OPT_sdk)) {
OI.SDKPath = A->getValue();
@@ -1032,7 +1032,6 @@ void Driver::buildActions(const ToolChain &TC,
ActionList CompileActions;
switch (OI.CompilerMode) {
case OutputInfo::Mode::StandardCompile:
case OutputInfo::Mode::FixCode:
case OutputInfo::Mode::UpdateCode: {
for (const InputPair &Input : Inputs) {
types::ID InputType = Input.first;
@@ -1631,6 +1630,26 @@ Job *Driver::buildJobsForAction(Compilation &C, const Action *A,
}
}
if (OI.ShouldGenerateFixitEdits && isa<CompileJobAction>(JA)) {
StringRef OFMFixitsOutputPath;
if (OutputMap) {
auto iter = OutputMap->find(types::TY_Remapping);
if (iter != OutputMap->end())
OFMFixitsOutputPath = iter->second;
}
if (!OFMFixitsOutputPath.empty()) {
Output->setAdditionalOutputForType(types::ID::TY_Remapping,
OFMFixitsOutputPath);
} else {
llvm::SmallString<128> Path(Output->getPrimaryOutputFilenames()[0]);
bool isTempFile = C.isTemporaryFile(Path);
llvm::sys::path::replace_extension(Path, "remap");
Output->setAdditionalOutputForType(types::ID::TY_Remapping, Path);
if (isTempFile)
C.addTemporaryFile(Path);
}
}
if (isa<CompileJobAction>(JA)) {
// Choose the serialized diagnostics output path.
if (C.getArgs().hasArg(options::OPT_serialize_diagnostics)) {
@@ -1837,7 +1856,6 @@ void Driver::printHelp(bool ShowHidden) const {
ExcludedFlagsBitmask |= options::NoInteractiveOption;
break;
case DriverKind::Batch:
case DriverKind::FixCode:
case DriverKind::AutolinkExtract:
ExcludedFlagsBitmask |= options::NoBatchOption;
break;