aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/CodeGen/StackProtector.cpp
diff options
context:
space:
mode:
authorMehdi Amini <mehdi.amini@apple.com>2017-04-06 20:23:57 +0000
committerMehdi Amini <mehdi.amini@apple.com>2017-04-06 20:23:57 +0000
commitdb11fdfda50017e0175602fec9949aa34141656a (patch)
tree97064cff0f2304c6d9c6f15e2a7c4f90fbbf9f8b /llvm/lib/CodeGen/StackProtector.cpp
parent98240e964366419bdbdb34706811f44e705d6786 (diff)
downloadllvm-db11fdfda50017e0175602fec9949aa34141656a.zip
llvm-db11fdfda50017e0175602fec9949aa34141656a.tar.gz
llvm-db11fdfda50017e0175602fec9949aa34141656a.tar.bz2
Revert "Turn some C-style vararg into variadic templates"
This reverts commit r299699, the examples needs to be updated. llvm-svn: 299702
Diffstat (limited to 'llvm/lib/CodeGen/StackProtector.cpp')
-rw-r--r--llvm/lib/CodeGen/StackProtector.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/StackProtector.cpp b/llvm/lib/CodeGen/StackProtector.cpp
index 7230b01..e3fdb96 100644
--- a/llvm/lib/CodeGen/StackProtector.cpp
+++ b/llvm/lib/CodeGen/StackProtector.cpp
@@ -481,15 +481,16 @@ BasicBlock *StackProtector::CreateFailBB() {
IRBuilder<> B(FailBB);
B.SetCurrentDebugLocation(DebugLoc::get(0, 0, F->getSubprogram()));
if (Trip.isOSOpenBSD()) {
- Constant *StackChkFail = M->getOrInsertFunction(
- "__stack_smash_handler", Type::getVoidTy(Context),
- Type::getInt8PtrTy(Context));
+ Constant *StackChkFail =
+ M->getOrInsertFunction("__stack_smash_handler",
+ Type::getVoidTy(Context),
+ Type::getInt8PtrTy(Context), nullptr);
B.CreateCall(StackChkFail, B.CreateGlobalStringPtr(F->getName(), "SSH"));
} else {
Constant *StackChkFail =
- M->getOrInsertFunction("__stack_chk_fail", Type::getVoidTy(Context));
-
+ M->getOrInsertFunction("__stack_chk_fail", Type::getVoidTy(Context),
+ nullptr);
B.CreateCall(StackChkFail, {});
}
B.CreateUnreachable();