diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-05-21 08:14:24 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-05-21 08:14:24 +0000 |
| commit | fc9c78a6b6bb4bb447ac3eda0ffadadf50dd215d (patch) | |
| tree | 7d80690e7667d0c0824be92c3432ecbd8e006bde /llvm/lib | |
| parent | b4e24fccd1b3597886fe46786596e9811f856bd6 (diff) | |
| download | bcm5719-llvm-fc9c78a6b6bb4bb447ac3eda0ffadadf50dd215d.tar.gz bcm5719-llvm-fc9c78a6b6bb4bb447ac3eda0ffadadf50dd215d.zip | |
[asan] Fix x86-32 asm instrumentation to preserve flags.
Patch by Yuri Gorshenin.
llvm-svn: 209280
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp index 85c7bf00972..f3e6b3f4193 100644 --- a/llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp +++ b/llvm/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)); } |
