From f45fd429b7184845f7f6567227df32ebb94a04af Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Wed, 17 Jul 2019 21:27:44 +0000
Subject: [PATCH] Speculative fix for stack-tagging.ll failure.

Depending on the evaluation order of function call arguments,
the current code may insert a use before def.

llvm-svn: 366375
---
 llvm/lib/Target/AArch64/AArch64StackTagging.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/Target/AArch64/AArch64StackTagging.cpp b/llvm/lib/Target/AArch64/AArch64StackTagging.cpp
index f27a6311365a..6e99c48bf1d7 100644
--- a/llvm/lib/Target/AArch64/AArch64StackTagging.cpp
+++ b/llvm/lib/Target/AArch64/AArch64StackTagging.cpp
@@ -316,8 +316,8 @@ bool AArch64StackTagging::runOnFunction(Function &Fn) {
       untagAlloca(AI, Info.LifetimeEnd[0], Size);
     } else {
       uint64_t Size = Info.AI->getAllocationSizeInBits(*DL).getValue() / 8;
-      tagAlloca(AI, TagPCall->getNextNode(),
-                IRB.CreatePointerCast(TagPCall, IRB.getInt8PtrTy()), Size);
+      Value *Ptr = IRB.CreatePointerCast(TagPCall, IRB.getInt8PtrTy());
+      tagAlloca(AI, &*IRB.GetInsertPoint(), Ptr, Size);
       for (auto &RI : RetVec) {
         untagAlloca(AI, RI, Size);
       }