diff options
| author | James Y Knight <jyknight@google.com> | 2019-01-31 21:51:58 +0000 |
|---|---|---|
| committer | James Y Knight <jyknight@google.com> | 2019-01-31 21:51:58 +0000 |
| commit | fadf25068e32b44b010e6e03c6ab93bec41eae82 (patch) | |
| tree | 9b22878f495e0b75d9e86cd01bcf199308dc9234 /llvm/lib/CodeGen/StackProtector.cpp | |
| parent | c62214da3de04f702e29e4ba4772c9463e2829ca (diff) | |
| download | llvm-fadf25068e32b44b010e6e03c6ab93bec41eae82.zip llvm-fadf25068e32b44b010e6e03c6ab93bec41eae82.tar.gz llvm-fadf25068e32b44b010e6e03c6ab93bec41eae82.tar.bz2 | |
Revert "[opaque pointer types] Add a FunctionCallee wrapper type, and use it."
This reverts commit f47d6b38c7a61d50db4566b02719de05492dcef1 (r352791).
Seems to run into compilation failures with GCC (but not clang, where
I tested it). Reverting while I investigate.
llvm-svn: 352800
Diffstat (limited to 'llvm/lib/CodeGen/StackProtector.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/StackProtector.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/StackProtector.cpp b/llvm/lib/CodeGen/StackProtector.cpp index e7be79e..78f13e7 100644 --- a/llvm/lib/CodeGen/StackProtector.cpp +++ b/llvm/lib/CodeGen/StackProtector.cpp @@ -499,13 +499,14 @@ BasicBlock *StackProtector::CreateFailBB() { IRBuilder<> B(FailBB); B.SetCurrentDebugLocation(DebugLoc::get(0, 0, F->getSubprogram())); if (Trip.isOSOpenBSD()) { - FunctionCallee 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)); B.CreateCall(StackChkFail, B.CreateGlobalStringPtr(F->getName(), "SSH")); } else { - FunctionCallee StackChkFail = + Constant *StackChkFail = M->getOrInsertFunction("__stack_chk_fail", Type::getVoidTy(Context)); B.CreateCall(StackChkFail, {}); |