commit 1d993270b30e6e46fdabcc8e414900e46a325d84
author Serge Guelton <sguelton@quarkslab.com> Tue May 09 19:31:30 2017 +0000
committer Serge Guelton <sguelton@quarkslab.com> Tue May 09 19:31:30 2017 +0000
tree a912b4b1e6f88e67a7a0d78694d3f2d008e058e4
parent e38003f8399531b00e9fc8e9c6cfe311bc3ad4fb

Suppress all uses of LLVM_END_WITH_NULL. NFC.

Use variadic templates instead of relying on <cstdarg> + sentinel.

This enforces better type checking and makes code more readable.

Differential revision: https://reviews.llvm.org/D32550

llvm-svn: 302572

clang/lib/CodeGen/CGExpr.cpp

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 863b438..cef6292 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -2859,9 +2859,9 @@
   EmitTrapCheck(DataIsNotNullPtr);
 
   llvm::StructType *SourceLocationTy =
-      llvm::StructType::get(VoidPtrTy, Int32Ty, Int32Ty, nullptr);
+      llvm::StructType::get(VoidPtrTy, Int32Ty, Int32Ty);
   llvm::StructType *CfiCheckFailDataTy =
-      llvm::StructType::get(Int8Ty, SourceLocationTy, VoidPtrTy, nullptr);
+      llvm::StructType::get(Int8Ty, SourceLocationTy, VoidPtrTy);
 
   llvm::Value *V = Builder.CreateConstGEP2_32(
       CfiCheckFailDataTy,