aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/CodeGen/StackProtector.cpp
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2008-11-18 07:30:57 +0000
committerBill Wendling <isanbard@gmail.com>2008-11-18 07:30:57 +0000
commit7235002bd131dd850633cad530da6853af852ee5 (patch)
tree89e249a52480d949e5e97e81910925e3d5071f7a /llvm/lib/CodeGen/StackProtector.cpp
parentee4fa9cfbbf6f1de762db433faed3b3835132a35 (diff)
downloadllvm-7235002bd131dd850633cad530da6853af852ee5.zip
llvm-7235002bd131dd850633cad530da6853af852ee5.tar.gz
llvm-7235002bd131dd850633cad530da6853af852ee5.tar.bz2
Remove the stackprotector_check intrinsic. Use a volatile load instead.
llvm-svn: 59504
Diffstat (limited to 'llvm/lib/CodeGen/StackProtector.cpp')
-rw-r--r--llvm/lib/CodeGen/StackProtector.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/llvm/lib/CodeGen/StackProtector.cpp b/llvm/lib/CodeGen/StackProtector.cpp
index 10b5d6d..8fe6529 100644
--- a/llvm/lib/CodeGen/StackProtector.cpp
+++ b/llvm/lib/CodeGen/StackProtector.cpp
@@ -177,7 +177,7 @@ bool StackProtector::InsertStackProtectors() {
// return:
// ...
// %1 = load __stack_chk_guard
- // %2 = call i8* @llvm.stackprotect.check(StackGuardSlot)
+ // %2 = load StackGuardSlot
// %3 = cmp i1 %1, %2
// br i1 %3, label %SP_return, label %CallStackCheckFailBlk
//
@@ -196,11 +196,9 @@ bool StackProtector::InsertStackProtectors() {
NewBB->moveAfter(BB);
// Generate the stack protector instructions in the old basic block.
- LoadInst *LI = new LoadInst(StackGuardVar, "", false, BB);
- CallInst *CI = CallInst::
- Create(Intrinsic::getDeclaration(M, Intrinsic::stackprotector_check),
- AI, "", BB);
- ICmpInst *Cmp = new ICmpInst(CmpInst::ICMP_EQ, CI, LI, "", BB);
+ LoadInst *LI1 = new LoadInst(StackGuardVar, "", false, BB);
+ LoadInst *LI2 = new LoadInst(AI, "", true, BB);
+ ICmpInst *Cmp = new ICmpInst(CmpInst::ICMP_EQ, LI1, LI2, "", BB);
BranchInst::Create(NewBB, FailBB, Cmp, BB);
}