Skip to content

[DNM] Cross-repository test PR, please ignore. #38890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[DNM] Cross-repository test PR, please ignore. #38890

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
//
// This file contains implementations of parts of the compiler driver.
// This file contains implementations of parts of the compiler driver. test.
//
//===----------------------------------------------------------------------===//

Expand Down Expand Up @@ -72,7 +72,7 @@ Driver::Driver(StringRef DriverExecutable,
: Opts(createSwiftOptTable()), Diags(Diags),
Name(Name), DriverExecutable(DriverExecutable),
DefaultTargetTriple(llvm::sys::getDefaultTargetTriple()) {

// The driver kind must be parsed prior to parsing arguments, since that
// affects how arguments are parsed.
parseDriverKind(Args.slice(1));
Expand Down Expand Up @@ -908,7 +908,7 @@ Driver::buildCompilation(const ToolChain &TC,
translateInputAndPathArgs(*ArgList, workingDirectory));

validateArgs(Diags, *TranslatedArgList, TC.getTriple());

// Perform toolchain specific args validation.
TC.validateArguments(Diags, *TranslatedArgList, DefaultTargetTriple);

Expand Down Expand Up @@ -1003,7 +1003,7 @@ Driver::buildCompilation(const ToolChain &TC,
llvm_unreachable("Unknown OutputLevel argument!");
}


// About to move argument list, so capture some flags that will be needed
// later.
const bool DriverPrintActions =
Expand Down Expand Up @@ -1499,7 +1499,7 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
if (Args.hasArg(options::OPT_static))
Diags.diagnose(SourceLoc(),
diag::error_static_emit_executable_disallowed);

OI.LinkAction = LinkKind::Executable;
OI.CompilerOutputType = CompilerOutputType;
break;
Expand Down Expand Up @@ -2530,14 +2530,14 @@ static StringRef baseNameForImage(const JobAction *JA, const OutputInfo &OI,
StringRef BaseInput, StringRef BaseName) {
if (JA->size() == 1 && OI.ModuleNameIsFallback && BaseInput != "-")
return llvm::sys::path::stem(BaseInput);

if (isa<StaticLinkJobAction>(JA)) {
Buffer = "lib";
Buffer.append(BaseName);
Buffer.append(Triple.isOSWindows() ? ".lib" : ".a");
return Buffer.str();
}

auto link = dyn_cast<DynamicLinkJobAction>(JA);
if (!link)
return BaseName;
Expand Down Expand Up @@ -2993,7 +2993,7 @@ Job *Driver::buildJobsForAction(Compilation &C, const JobAction *JA,

// 4. Construct a Job which produces the right CommandOutput.
std::unique_ptr<Job> ownedJob = TC.constructJob(*JA, C, std::move(InputJobs),
InputActions,
InputActions,
std::move(Output), OI);
Job *J = C.addJob(std::move(ownedJob));

Expand Down Expand Up @@ -3557,7 +3557,7 @@ void Driver::printHelp(bool ShowHidden) const {
IncludedFlagsBitmask, ExcludedFlagsBitmask,
/*ShowAllAliases*/false);

// These strings match the descriptions found in the corresponding swiftpm
// These strings match the descriptions found in the corresponding swiftpm
// help pages
if (driverKind == DriverKind::Interactive) {
llvm::outs() << "\nSEE ALSO - PACKAGE MANAGER COMMANDS: \n"
Expand All @@ -3566,7 +3566,7 @@ void Driver::printHelp(bool ShowHidden) const {
"\t\"swift run\" Build and run an executable product \n"
"\t\"swift test\" Build and run tests \n";
} else {
llvm::outs() << "\nSEE ALSO: swift build, swift run, swift package, "
llvm::outs() << "\nSEE ALSO: swift build, swift run, swift package, "
"swift test \n";
}

Expand Down