r209069 - [C++11] Use 'nullptr'. Driver edition.
Craig Topper
craig.topper at gmail.com
Sat May 17 09:56:41 PDT 2014
Author: ctopper
Date: Sat May 17 11:56:41 2014
New Revision: 209069
URL: http://llvm.org/viewvc/llvm-project?rev=209069&view=rev
Log:
[C++11] Use 'nullptr'. Driver edition.
Modified:
cfe/trunk/lib/Driver/Compilation.cpp
cfe/trunk/lib/Driver/Driver.cpp
cfe/trunk/lib/Driver/Job.cpp
cfe/trunk/lib/Driver/SanitizerArgs.cpp
cfe/trunk/lib/Driver/ToolChains.cpp
cfe/trunk/lib/Driver/Tools.cpp
cfe/trunk/lib/Driver/WindowsToolChain.cpp
Modified: cfe/trunk/lib/Driver/Compilation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Compilation.cpp?rev=209069&r1=209068&r2=209069&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Compilation.cpp (original)
+++ cfe/trunk/lib/Driver/Compilation.cpp Sat May 17 11:56:41 2014
@@ -27,7 +27,7 @@ using namespace llvm::opt;
Compilation::Compilation(const Driver &D, const ToolChain &_DefaultToolChain,
InputArgList *_Args, DerivedArgList *_TranslatedArgs)
: TheDriver(D), DefaultToolChain(_DefaultToolChain), Args(_Args),
- TranslatedArgs(_TranslatedArgs), Redirects(0) {
+ TranslatedArgs(_TranslatedArgs), Redirects(nullptr) {
}
Compilation::~Compilation() {
@@ -199,7 +199,7 @@ void Compilation::ExecuteJob(const Job &
if (const Command *C = dyn_cast<Command>(&J)) {
if (!InputsOk(*C, FailingCommands))
return;
- const Command *FailingCommand = 0;
+ const Command *FailingCommand = nullptr;
if (int Res = ExecuteCommand(*C, FailingCommand))
FailingCommands.push_back(std::make_pair(Res, FailingCommand));
} else {
@@ -232,7 +232,7 @@ void Compilation::initCompilationForDiag
// Redirect stdout/stderr to /dev/null.
Redirects = new const StringRef*[3]();
- Redirects[0] = 0;
+ Redirects[0] = nullptr;
Redirects[1] = new const StringRef();
Redirects[2] = new const StringRef();
}
Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=209069&r1=209068&r2=209069&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Sat May 17 11:56:41 2014
@@ -53,8 +53,8 @@ Driver::Driver(StringRef ClangExecutable
UseStdLib(true), DefaultTargetTriple(DefaultTargetTriple),
DefaultImageName("a.out"),
DriverTitle("clang LLVM compiler"),
- CCPrintOptionsFilename(0), CCPrintHeadersFilename(0),
- CCLogDiagnosticsFilename(0),
+ CCPrintOptionsFilename(nullptr), CCPrintHeadersFilename(nullptr),
+ CCLogDiagnosticsFilename(nullptr),
CCCPrintBindings(false),
CCPrintHeaders(false), CCLogDiagnostics(false),
CCGenDiagnostics(false), CCCGenericGCCName(""), CheckInputsExist(true),
@@ -152,7 +152,7 @@ InputArgList *Driver::ParseArgStrings(Ar
// option we used to determine the final phase.
phases::ID Driver::getFinalPhase(const DerivedArgList &DAL, Arg **FinalPhaseArg)
const {
- Arg *PhaseArg = 0;
+ Arg *PhaseArg = nullptr;
phases::ID FinalPhase;
// -{E,M,MM} and /P only run the preprocessor.
@@ -419,7 +419,8 @@ void Driver::generateCompilationDiagnost
// Suppress driver output and emit preprocessor output to temp file.
Mode = CPPMode;
CCGenDiagnostics = true;
- C.getArgs().AddFlagArg(0, Opts->getOption(options::OPT_frewrite_includes));
+ C.getArgs().AddFlagArg(nullptr,
+ Opts->getOption(options::OPT_frewrite_includes));
// Save the original job command(s).
std::string Cmd;
@@ -962,7 +963,7 @@ void Driver::BuildInputs(const ToolChain
// argument used to set the type; we only want to claim the type when we
// actually use it, so we warn about unused -x arguments.
types::ID InputType = types::TY_Nothing;
- Arg *InputTypeArg = 0;
+ Arg *InputTypeArg = nullptr;
// The last /TC or /TP option sets the input type to C or C++ globally.
if (Arg *TCTP = Args.getLastArg(options::OPT__SLASH_TC,
@@ -1341,7 +1342,7 @@ void Driver::BuildJobs(Compilation &C) c
if (NumOutputs > 1) {
Diag(clang::diag::err_drv_output_argument_with_multiple_files);
- FinalOutput = 0;
+ FinalOutput = nullptr;
}
}
@@ -1366,7 +1367,7 @@ void Driver::BuildJobs(Compilation &C) c
//
// FIXME: This is a hack; find a cleaner way to integrate this into the
// process.
- const char *LinkingOutput = 0;
+ const char *LinkingOutput = nullptr;
if (isa<LipoJobAction>(A)) {
if (FinalOutput)
LinkingOutput = FinalOutput->getValue();
@@ -1376,7 +1377,7 @@ void Driver::BuildJobs(Compilation &C) c
InputInfo II;
BuildJobsForAction(C, A, &C.getDefaultToolChain(),
- /*BoundArch*/0,
+ /*BoundArch*/nullptr,
/*AtTopLevel*/ true,
/*MultipleArchs*/ ArchNames.size() > 1,
/*LinkingOutput*/ LinkingOutput,
@@ -1433,7 +1434,7 @@ void Driver::BuildJobs(Compilation &C) c
static const Tool *SelectToolForJob(Compilation &C, const ToolChain *TC,
const JobAction *JA,
const ActionList *&Inputs) {
- const Tool *ToolForJob = 0;
+ const Tool *ToolForJob = nullptr;
// See if we should look for a compiler with an integrated assembler. We match
// bottom up, so what we are actually looking for is an assembler job with a
@@ -1449,7 +1450,7 @@ static const Tool *SelectToolForJob(Comp
const Tool *Compiler =
TC->SelectTool(cast<JobAction>(**Inputs->begin()));
if (!Compiler)
- return NULL;
+ return nullptr;
if (Compiler->hasIntegratedAssembler()) {
Inputs = &(*Inputs)[0]->getInputs();
ToolForJob = Compiler;
Modified: cfe/trunk/lib/Driver/Job.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Job.cpp?rev=209069&r1=209068&r2=209069&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Job.cpp (original)
+++ cfe/trunk/lib/Driver/Job.cpp Sat May 17 11:56:41 2014
@@ -124,9 +124,9 @@ int Command::Execute(const StringRef **R
Argv.push_back(Executable);
for (size_t i = 0, e = Arguments.size(); i != e; ++i)
Argv.push_back(Arguments[i]);
- Argv.push_back(0);
+ Argv.push_back(nullptr);
- return llvm::sys::ExecuteAndWait(Executable, Argv.data(), /*env*/ 0,
+ return llvm::sys::ExecuteAndWait(Executable, Argv.data(), /*env*/ nullptr,
Redirects, /*secondsToWait*/ 0,
/*memoryLimit*/ 0, ErrMsg, ExecutionFailed);
}
Modified: cfe/trunk/lib/Driver/SanitizerArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/SanitizerArgs.cpp?rev=209069&r1=209068&r2=209069&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/SanitizerArgs.cpp (original)
+++ cfe/trunk/lib/Driver/SanitizerArgs.cpp Sat May 17 11:56:41 2014
@@ -331,7 +331,7 @@ std::string SanitizerArgs::describeSanit
bool SanitizerArgs::getDefaultBlacklistForKind(const Driver &D, unsigned Kind,
std::string &BLPath) {
- const char *BlacklistFile = 0;
+ const char *BlacklistFile = nullptr;
if (Kind & NeedsAsanRt)
BlacklistFile = "asan_blacklist.txt";
else if (Kind & NeedsMsanRt)
Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=209069&r1=209068&r2=209069&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Sat May 17 11:56:41 2014
@@ -118,7 +118,7 @@ static const char *GetArmArchForMArch(St
.Cases("armv7k", "armv7-k", "armv7k")
.Cases("armv7m", "armv7-m", "armv7m")
.Cases("armv7s", "armv7-s", "armv7s")
- .Default(0);
+ .Default(nullptr);
}
static const char *GetArmArchForMCpu(StringRef Value) {
@@ -135,7 +135,7 @@ static const char *GetArmArchForMCpu(Str
.Case("cortex-m3", "armv7m")
.Case("cortex-m4", "armv7em")
.Case("swift", "armv7s")
- .Default(0);
+ .Default(nullptr);
}
static bool isSoftFloatABI(const ArgList &Args) {
@@ -449,7 +449,7 @@ void Darwin::AddDeploymentTarget(Derived
if (llvm::sys::path::is_absolute(env) && llvm::sys::fs::exists(env) &&
StringRef(env) != "/") {
Args.append(Args.MakeSeparateArg(
- 0, Opts.getOption(options::OPT_isysroot), env));
+ nullptr, Opts.getOption(options::OPT_isysroot), env));
}
}
}
@@ -463,12 +463,12 @@ void Darwin::AddDeploymentTarget(Derived
getDriver().Diag(diag::err_drv_argument_not_allowed_with)
<< OSXVersion->getAsString(Args)
<< (iOSVersion ? iOSVersion : iOSSimVersion)->getAsString(Args);
- iOSVersion = iOSSimVersion = 0;
+ iOSVersion = iOSSimVersion = nullptr;
} else if (iOSVersion && iOSSimVersion) {
getDriver().Diag(diag::err_drv_argument_not_allowed_with)
<< iOSVersion->getAsString(Args)
<< iOSSimVersion->getAsString(Args);
- iOSSimVersion = 0;
+ iOSSimVersion = nullptr;
} else if (!OSXVersion && !iOSVersion && !iOSSimVersion) {
// If no deployment target was specified on the command line, check for
// environment defines.
@@ -528,22 +528,22 @@ void Darwin::AddDeploymentTarget(Derived
if (!OSXTarget.empty()) {
const Option O = Opts.getOption(options::OPT_mmacosx_version_min_EQ);
- OSXVersion = Args.MakeJoinedArg(0, O, OSXTarget);
+ OSXVersion = Args.MakeJoinedArg(nullptr, O, OSXTarget);
Args.append(OSXVersion);
} else if (!iOSTarget.empty()) {
const Option O = Opts.getOption(options::OPT_miphoneos_version_min_EQ);
- iOSVersion = Args.MakeJoinedArg(0, O, iOSTarget);
+ iOSVersion = Args.MakeJoinedArg(nullptr, O, iOSTarget);
Args.append(iOSVersion);
} else if (!iOSSimTarget.empty()) {
const Option O = Opts.getOption(
options::OPT_mios_simulator_version_min_EQ);
- iOSSimVersion = Args.MakeJoinedArg(0, O, iOSSimTarget);
+ iOSSimVersion = Args.MakeJoinedArg(nullptr, O, iOSSimTarget);
Args.append(iOSSimVersion);
} else if (MachOArchName != "armv6m" && MachOArchName != "armv7m" &&
MachOArchName != "armv7em") {
// Otherwise, assume we are targeting OS X.
const Option O = Opts.getOption(options::OPT_mmacosx_version_min_EQ);
- OSXVersion = Args.MakeJoinedArg(0, O, MacosxVersionMin);
+ OSXVersion = Args.MakeJoinedArg(nullptr, O, MacosxVersionMin);
Args.append(OSXVersion);
}
}
@@ -800,7 +800,8 @@ DerivedArgList *MachO::TranslateArgs(con
if (getTriple().getArch() == llvm::Triple::x86 ||
getTriple().getArch() == llvm::Triple::x86_64)
if (!Args.hasArgNoClaim(options::OPT_mtune_EQ))
- DAL->AddJoinedArg(0, Opts.getOption(options::OPT_mtune_EQ), "core2");
+ DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_mtune_EQ),
+ "core2");
// Add the arch options based on the particular spelling of -arch, to match
// how the driver driver works.
@@ -814,76 +815,76 @@ DerivedArgList *MachO::TranslateArgs(con
if (Name == "ppc")
;
else if (Name == "ppc601")
- DAL->AddJoinedArg(0, MCpu, "601");
+ DAL->AddJoinedArg(nullptr, MCpu, "601");
else if (Name == "ppc603")
- DAL->AddJoinedArg(0, MCpu, "603");
+ DAL->AddJoinedArg(nullptr, MCpu, "603");
else if (Name == "ppc604")
- DAL->AddJoinedArg(0, MCpu, "604");
+ DAL->AddJoinedArg(nullptr, MCpu, "604");
else if (Name == "ppc604e")
- DAL->AddJoinedArg(0, MCpu, "604e");
+ DAL->AddJoinedArg(nullptr, MCpu, "604e");
else if (Name == "ppc750")
- DAL->AddJoinedArg(0, MCpu, "750");
+ DAL->AddJoinedArg(nullptr, MCpu, "750");
else if (Name == "ppc7400")
- DAL->AddJoinedArg(0, MCpu, "7400");
+ DAL->AddJoinedArg(nullptr, MCpu, "7400");
else if (Name == "ppc7450")
- DAL->AddJoinedArg(0, MCpu, "7450");
+ DAL->AddJoinedArg(nullptr, MCpu, "7450");
else if (Name == "ppc970")
- DAL->AddJoinedArg(0, MCpu, "970");
+ DAL->AddJoinedArg(nullptr, MCpu, "970");
else if (Name == "ppc64" || Name == "ppc64le")
- DAL->AddFlagArg(0, Opts.getOption(options::OPT_m64));
+ DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_m64));
else if (Name == "i386")
;
else if (Name == "i486")
- DAL->AddJoinedArg(0, MArch, "i486");
+ DAL->AddJoinedArg(nullptr, MArch, "i486");
else if (Name == "i586")
- DAL->AddJoinedArg(0, MArch, "i586");
+ DAL->AddJoinedArg(nullptr, MArch, "i586");
else if (Name == "i686")
- DAL->AddJoinedArg(0, MArch, "i686");
+ DAL->AddJoinedArg(nullptr, MArch, "i686");
else if (Name == "pentium")
- DAL->AddJoinedArg(0, MArch, "pentium");
+ DAL->AddJoinedArg(nullptr, MArch, "pentium");
else if (Name == "pentium2")
- DAL->AddJoinedArg(0, MArch, "pentium2");
+ DAL->AddJoinedArg(nullptr, MArch, "pentium2");
else if (Name == "pentpro")
- DAL->AddJoinedArg(0, MArch, "pentiumpro");
+ DAL->AddJoinedArg(nullptr, MArch, "pentiumpro");
else if (Name == "pentIIm3")
- DAL->AddJoinedArg(0, MArch, "pentium2");
+ DAL->AddJoinedArg(nullptr, MArch, "pentium2");
else if (Name == "x86_64")
- DAL->AddFlagArg(0, Opts.getOption(options::OPT_m64));
+ DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_m64));
else if (Name == "x86_64h") {
- DAL->AddFlagArg(0, Opts.getOption(options::OPT_m64));
- DAL->AddJoinedArg(0, MArch, "x86_64h");
+ DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_m64));
+ DAL->AddJoinedArg(nullptr, MArch, "x86_64h");
}
else if (Name == "arm")
- DAL->AddJoinedArg(0, MArch, "armv4t");
+ DAL->AddJoinedArg(nullptr, MArch, "armv4t");
else if (Name == "armv4t")
- DAL->AddJoinedArg(0, MArch, "armv4t");
+ DAL->AddJoinedArg(nullptr, MArch, "armv4t");
else if (Name == "armv5")
- DAL->AddJoinedArg(0, MArch, "armv5tej");
+ DAL->AddJoinedArg(nullptr, MArch, "armv5tej");
else if (Name == "xscale")
- DAL->AddJoinedArg(0, MArch, "xscale");
+ DAL->AddJoinedArg(nullptr, MArch, "xscale");
else if (Name == "armv6")
- DAL->AddJoinedArg(0, MArch, "armv6k");
+ DAL->AddJoinedArg(nullptr, MArch, "armv6k");
else if (Name == "armv6m")
- DAL->AddJoinedArg(0, MArch, "armv6m");
+ DAL->AddJoinedArg(nullptr, MArch, "armv6m");
else if (Name == "armv7")
- DAL->AddJoinedArg(0, MArch, "armv7a");
+ DAL->AddJoinedArg(nullptr, MArch, "armv7a");
else if (Name == "armv7em")
- DAL->AddJoinedArg(0, MArch, "armv7em");
+ DAL->AddJoinedArg(nullptr, MArch, "armv7em");
else if (Name == "armv7k")
- DAL->AddJoinedArg(0, MArch, "armv7k");
+ DAL->AddJoinedArg(nullptr, MArch, "armv7k");
else if (Name == "armv7m")
- DAL->AddJoinedArg(0, MArch, "armv7m");
+ DAL->AddJoinedArg(nullptr, MArch, "armv7m");
else if (Name == "armv7s")
- DAL->AddJoinedArg(0, MArch, "armv7s");
+ DAL->AddJoinedArg(nullptr, MArch, "armv7s");
else if (Name == "arm64")
- DAL->AddJoinedArg(0, MArch, "arm64");
+ DAL->AddJoinedArg(nullptr, MArch, "arm64");
else if (Name == "armv8")
- DAL->AddJoinedArg(0, MArch, "arm64");
+ DAL->AddJoinedArg(nullptr, MArch, "arm64");
}
return DAL;
@@ -944,7 +945,8 @@ DerivedArgList *Darwin::TranslateArgs(co
if (((isTargetMacOS() && !isMacosxVersionLT(10, 9)) ||
(isTargetIOSBased() && !isIPhoneOSVersionLT(7, 0))) &&
!Args.getLastArg(options::OPT_stdlib_EQ))
- DAL->AddJoinedArg(0, Opts.getOption(options::OPT_stdlib_EQ), "libc++");
+ DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_stdlib_EQ),
+ "libc++");
// Validate the C++ standard library choice.
CXXStdlibType Type = GetCXXStdlibType(*DAL);
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=209069&r1=209068&r2=209069&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Sat May 17 11:56:41 2014
@@ -768,7 +768,7 @@ void Clang::AddARMTargetArgs(const ArgLi
// Select the ABI to use.
//
// FIXME: Support -meabi.
- const char *ABIName = 0;
+ const char *ABIName = nullptr;
if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ)) {
ABIName = A->getValue();
} else if (Triple.isOSDarwin()) {
@@ -898,7 +898,7 @@ void Clang::AddARM64TargetArgs(const Arg
options::OPT_mno_implicit_float, true))
CmdArgs.push_back("-no-implicit-float");
- const char *ABIName = 0;
+ const char *ABIName = nullptr;
if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ))
ABIName = A->getValue();
else if (Triple.isOSDarwin())
@@ -1304,7 +1304,7 @@ static const char *getX86TargetCPU(const
if (Triple.getArch() != llvm::Triple::x86_64 &&
Triple.getArch() != llvm::Triple::x86)
- return 0; // This routine is only handling x86 targets.
+ return nullptr; // This routine is only handling x86 targets.
bool Is64Bit = Triple.getArch() == llvm::Triple::x86_64;
@@ -6341,7 +6341,7 @@ void freebsd::Link::ConstructJob(Compila
if (!Args.hasArg(options::OPT_nostdlib) &&
!Args.hasArg(options::OPT_nostartfiles)) {
- const char *crt1 = NULL;
+ const char *crt1 = nullptr;
if (!Args.hasArg(options::OPT_shared)) {
if (Args.hasArg(options::OPT_pg))
crt1 = "gcrt1.o";
@@ -6355,7 +6355,7 @@ void freebsd::Link::ConstructJob(Compila
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
- const char *crtbegin = NULL;
+ const char *crtbegin = nullptr;
if (Args.hasArg(options::OPT_static))
crtbegin = "crtbeginT.o";
else if (Args.hasArg(options::OPT_shared) || IsPIE)
@@ -7071,7 +7071,7 @@ void gnutools::Link::ConstructJob(Compil
if (!Args.hasArg(options::OPT_nostdlib) &&
!Args.hasArg(options::OPT_nostartfiles)) {
if (!isAndroid) {
- const char *crt1 = NULL;
+ const char *crt1 = nullptr;
if (!Args.hasArg(options::OPT_shared)){
if (Args.hasArg(options::OPT_pg))
crt1 = "gcrt1.o";
Modified: cfe/trunk/lib/Driver/WindowsToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/WindowsToolChain.cpp?rev=209069&r1=209068&r2=209069&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/WindowsToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/WindowsToolChain.cpp Sat May 17 11:56:41 2014
@@ -46,7 +46,7 @@ Tool *Windows::buildAssembler() const {
if (getTriple().isOSBinFormatMachO())
return new tools::darwin::Assemble(*this);
getDriver().Diag(clang::diag::err_no_external_assembler);
- return NULL;
+ return nullptr;
}
bool Windows::IsIntegratedAssemblerDefault() const {
More information about the cfe-commits
mailing list