commit fc9c78a6b6bb4bb447ac3eda0ffadadf50dd215d
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Wed May 21 08:14:24 2014 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Wed May 21 08:14:24 2014 +0000
tree 7d80690e7667d0c0824be92c3432ecbd8e006bde
parent b4e24fccd1b3597886fe46786596e9811f856bd6

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

Patch by Yuri Gorshenin.

llvm-svn: 209280

llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp

diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp
index 85c7bf0..f3e6b3f 100644
--- a/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp
+++ b/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp
@@ -161,8 +161,7 @@
         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));
 }