diff options
author | Reid Kleckner <reid@kleckner.net> | 2014-12-01 22:02:27 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2014-12-01 22:02:27 +0000 |
commit | ee7cf84c8feb9ddc93fc5917e04d9db1a375db5f (patch) | |
tree | 390ec6b0d704161cbf2fcda48a5e03a247bfaecc /clang/lib/CodeGen/CodeGenModule.cpp | |
parent | 337c4bd4abac1198312d5d009cf6185063c97812 (diff) | |
download | bcm5719-llvm-ee7cf84c8feb9ddc93fc5917e04d9db1a375db5f.tar.gz bcm5719-llvm-ee7cf84c8feb9ddc93fc5917e04d9db1a375db5f.zip |
Use nullptr to silence -Wsentinel when self-hosting on Windows
Richard rejected my Sema change to interpret an integer literal zero in
a varargs context as a null pointer, so -Wsentinel sees an integer
literal zero and fires off a warning. Only CodeGen currently knows that
it promotes integer literal zeroes in this context to pointer size on
Windows. I didn't want to teach -Wsentinel about that compatibility
hack. Therefore, I'm migrating to C++11 nullptr.
llvm-svn: 223079
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
-rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index cefc2e91584..b6f1f4c97c7 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -624,7 +624,7 @@ void CodeGenModule::EmitCtorList(const CtorList &Fns, const char *GlobalName) { // Get the type of a ctor entry, { i32, void ()*, i8* }. llvm::StructType *CtorStructTy = llvm::StructType::get( - Int32Ty, llvm::PointerType::getUnqual(CtorFTy), VoidPtrTy, NULL); + Int32Ty, llvm::PointerType::getUnqual(CtorFTy), VoidPtrTy, nullptr); // Construct the constructor and destructor arrays. SmallVector<llvm::Constant*, 8> Ctors; |