diff options
| -rw-r--r-- | include/llvm/Intrinsics.td | 10 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/StackProtector.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td index 1e7f3d68da..6b6310f3ad 100644 --- a/include/llvm/Intrinsics.td +++ b/include/llvm/Intrinsics.td @@ -180,11 +180,11 @@ def int_pcmarker : Intrinsic<[llvm_void_ty], [llvm_i32_ty]>; def int_readcyclecounter : Intrinsic<[llvm_i64_ty]>; -// Stack Protector Intrinsic - The stackprotector_create writes the stack guard -// to the correct place on the stack frame. -def int_stackprotector_create : Intrinsic<[llvm_void_ty], - [llvm_ptr_ty, llvm_ptrptr_ty], - [IntrWriteMem]>; +// Stack Protector Intrinsic - The stackprotector intrinsic writes the stack +// guard to the correct place on the stack frame. +def int_stackprotector : Intrinsic<[llvm_void_ty], + [llvm_ptr_ty, llvm_ptrptr_ty], + [IntrWriteMem]>; //===------------------- Standard C Library Intrinsics --------------------===// // diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp index 140b856703..c92917d735 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp @@ -4019,7 +4019,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) { DAG.setRoot(DAG.getNode(ISD::STACKRESTORE, MVT::Other, getRoot(), Tmp)); return 0; } - case Intrinsic::stackprotector_create: { + case Intrinsic::stackprotector: { // Emit code into the DAG to store the stack guard onto the stack. MachineFunction &MF = DAG.getMachineFunction(); MachineFrameInfo *MFI = MF.getFrameInfo(); diff --git a/lib/CodeGen/StackProtector.cpp b/lib/CodeGen/StackProtector.cpp index 8fe6529ef4..5a129c0d9d 100644 --- a/lib/CodeGen/StackProtector.cpp +++ b/lib/CodeGen/StackProtector.cpp @@ -159,7 +159,7 @@ bool StackProtector::InsertStackProtectors() { Value *Args[] = { LI, AI }; CallInst:: - Create(Intrinsic::getDeclaration(M, Intrinsic::stackprotector_create), + Create(Intrinsic::getDeclaration(M, Intrinsic::stackprotector), &Args[0], array_endof(Args), "", InsPt); // Create the basic block to jump to when the guard check fails. |