From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Wed, 21 May 2014 08:14:24 +0000 (+0000)
Subject: [asan] Fix x86-32 asm instrumentation to preserve flags.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c0e669384dce6767a75a4aaa0d4bfb8e806cedbb;p=oota-llvm.git

[asan] Fix x86-32 asm instrumentation to preserve flags.

Patch by Yuri Gorshenin.


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

diff --git a/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp b/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp
index 85c7bf00972..f3e6b3f4193 100644
--- a/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp
@@ -161,8 +161,7 @@ void X86AddressSanitizer32::InstrumentMemOperandImpl(
         MCSymbolRefExpr::Create(FuncSym, MCSymbolRefExpr::VK_PLT, Ctx);
     EmitInstruction(Out, MCInstBuilder(X86::CALLpcrel32).addExpr(FuncExpr));
   }
-  EmitInstruction(Out, MCInstBuilder(X86::ADD32ri).addReg(X86::ESP)
-                           .addReg(X86::ESP).addImm(4));
+  EmitInstruction(Out, MCInstBuilder(X86::POP32r).addReg(X86::EAX));
   EmitInstruction(Out, MCInstBuilder(X86::POP32r).addReg(X86::EAX));
 }