diff options
| -rw-r--r-- | llvm/lib/Transforms/Instrumentation/SafeStack.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/Transforms/SafeStack/no-attr.ll | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/SafeStack.cpp b/llvm/lib/Transforms/Instrumentation/SafeStack.cpp index 13c54121831..6b185a2b127 100644 --- a/llvm/lib/Transforms/Instrumentation/SafeStack.cpp +++ b/llvm/lib/Transforms/Instrumentation/SafeStack.cpp @@ -165,7 +165,7 @@ class SafeStack : public FunctionPass { Type *Int32Ty; Type *Int8Ty; - Constant *UnsafeStackPtr; + Constant *UnsafeStackPtr = nullptr; /// Unsafe stack alignment. Each stack frame must ensure that the stack is /// aligned to this value. We need to re-align the unsafe stack if the @@ -232,8 +232,6 @@ public: Int32Ty = Type::getInt32Ty(M.getContext()); Int8Ty = Type::getInt8Ty(M.getContext()); - UnsafeStackPtr = getOrCreateUnsafeStackPtr(M); - return false; } @@ -576,6 +574,9 @@ bool SafeStack::runOnFunction(Function &F) { if (!StackRestorePoints.empty()) ++NumUnsafeStackRestorePointsFunctions; + if (!UnsafeStackPtr) + UnsafeStackPtr = getOrCreateUnsafeStackPtr(*F.getParent()); + // The top of the unsafe stack after all unsafe static allocas are allocated. Value *StaticTop = moveStaticAllocasToUnsafeStack(F, StaticAllocas, Returns); diff --git a/llvm/test/Transforms/SafeStack/no-attr.ll b/llvm/test/Transforms/SafeStack/no-attr.ll index ca3c21ab01b..d9bcefd3c84 100644 --- a/llvm/test/Transforms/SafeStack/no-attr.ll +++ b/llvm/test/Transforms/SafeStack/no-attr.ll @@ -6,6 +6,8 @@ ; no safestack attribute ; Requires no protector. +; CHECK-NOT: __safestack_unsafe_stack_ptr + ; CHECK: @foo define void @foo(i8* %a) nounwind uwtable { entry: |
