- Rename stackprotector_{prologue,epilogue} to stackprotector_{create,check}.

- Get rid of "HasStackProtector" in MachineFrameInfo.
- Modify intrinsics to tell which are doing what with memory.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58799 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 6 insertions, 12 deletions

diff --git a/include/llvm/CodeGen/MachineFrameInfo.h b/include/llvm/CodeGen/MachineFrameInfo.h
index 2741664972..4190bcd9a3 100644
--- a/include/llvm/CodeGen/MachineFrameInfo.h
+++ b/include/llvm/CodeGen/MachineFrameInfo.h
@@ -150,9 +150,6 @@ class MachineFrameInfo {
   /// only valid during and after prolog/epilog code insertion.
   bool HasCalls;
 
-  /// HasStackProtector - Set to true if this function has stack protectors.
-  bool HasStackProtector;
-
   /// StackProtectorIdx - The frame index for the stack protector.
   int StackProtectorIdx;
 
@@ -186,7 +183,6 @@ public:
     HasVarSizedObjects = false;
     FrameAddressTaken = false;
     HasCalls = false;
-    HasStackProtector = false;
     StackProtectorIdx = -1;
     MaxCallFrameSize = 0;
     MMI = 0;
@@ -203,11 +199,6 @@ public:
   ///
   bool hasVarSizedObjects() const { return HasVarSizedObjects; }
 
-  /// hasStackProtector - Return true if the function has a stack protector.
-  ///
-  bool hasStackProtector() const { return HasStackProtector; }
-  void setStackProtector(bool T) { HasStackProtector = T; }
-
   /// getStackProtectorIndex/setStackProtectorIndex - Return the index for the
   /// stack protector object.
   ///
diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td
index 8d5bc5cc83..690d4a6a47 100644
--- a/include/llvm/Intrinsics.td
+++ b/include/llvm/Intrinsics.td
@@ -176,9 +176,12 @@ def int_pcmarker      : Intrinsic<[llvm_void_ty, llvm_i32_ty]>;
 
 def int_readcyclecounter : Intrinsic<[llvm_i64_ty]>;
 
-// Stack protector intrinsics.
-def int_stackprotector_prologue : Intrinsic<[llvm_void_ty, llvm_ptr_ty]>;
-def int_stackprotector_epilogue : Intrinsic<[llvm_ptr_ty]>;
+// Stack Protector Intrinsics - The stackprotector_create writes the stack guard
+// to the correct place on the stack frame. The stackprotector_check reads back
+// the stack guard that the stackprotector_create stored.
+def int_stackprotector_create : Intrinsic<[llvm_void_ty, llvm_ptr_ty],
+                                          [IntrWriteMem]>;
+def int_stackprotector_check  : Intrinsic<[llvm_ptr_ty], [IntrReadMem]>;
 
 //===------------------- Standard C Library Intrinsics --------------------===//
 //