From 0cf4dc170117a82b8c895dc1e4e6c25985e92e8c Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Fri, 13 Mar 2015 11:54:32 +0000 Subject: [PATCH] Try to make AsmPrinter vtable compatible with previous shared library. r232083 added AsmPrinter::emitInlineAsmStart() before AsmPrinter::emitInlineAsmEnd(), changing the vtable in an incompatible way. This patch swaps the declaration order so that the new vtable entry is at the end of the vtable. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_35@232162 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/AsmPrinter.h | 8 ++++---- lib/Target/Mips/MipsAsmPrinter.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h index aeaf3a87f92..de14c1a9fb1 100644 --- a/include/llvm/CodeGen/AsmPrinter.h +++ b/include/llvm/CodeGen/AsmPrinter.h @@ -461,10 +461,6 @@ public: unsigned AsmVariant, const char *ExtraCode, raw_ostream &OS); - /// Let the target do anything it needs to do before emitting inlineasm. - /// \p StartInfo - the subtarget info before parsing inline asm - virtual void emitInlineAsmStart(const MCSubtargetInfo &StartInfo) const; - /// Let the target do anything it needs to do after emitting inlineasm. /// This callback can be used restore the original mode in case the /// inlineasm contains directives to switch modes. @@ -474,6 +470,10 @@ public: virtual void emitInlineAsmEnd(const MCSubtargetInfo &StartInfo, const MCSubtargetInfo *EndInfo) const; + /// Let the target do anything it needs to do before emitting inlineasm. + /// \p StartInfo - the subtarget info before parsing inline asm + virtual void emitInlineAsmStart(const MCSubtargetInfo &StartInfo) const; + private: /// Private state for PrintSpecial() // Assign a unique ID to this machine instruction. diff --git a/lib/Target/Mips/MipsAsmPrinter.h b/lib/Target/Mips/MipsAsmPrinter.h index 289466bab23..83af747b9a9 100644 --- a/lib/Target/Mips/MipsAsmPrinter.h +++ b/lib/Target/Mips/MipsAsmPrinter.h @@ -60,11 +60,11 @@ private: std::map StubsNeeded; - void emitInlineAsmStart(const MCSubtargetInfo &StartInfo) const override; - void emitInlineAsmEnd(const MCSubtargetInfo &StartInfo, const MCSubtargetInfo *EndInfo) const override; + void emitInlineAsmStart(const MCSubtargetInfo &StartInfo) const override; + void EmitJal(MCSymbol *Symbol); void EmitInstrReg(unsigned Opcode, unsigned Reg);