diff options
| -rw-r--r-- | include/llvm/CodeGen/TargetLoweringObjectFileImpl.h | 8 | ||||
| -rw-r--r-- | include/llvm/Target/TargetLoweringObjectFile.h | 4 | ||||
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfCFIException.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/TargetLoweringObjectFile.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86TargetObjectFile.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86TargetObjectFile.h | 4 |
7 files changed, 13 insertions, 14 deletions
diff --git a/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h b/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h index 411e4ccd08..493526aa7f 100644 --- a/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h +++ b/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h @@ -88,8 +88,8 @@ public: // getCFIPersonalitySymbol - The symbol that gets passed to .cfi_personality. virtual MCSymbol * - getCFIPersonalitySymbol(const GlobalValue *GV, unsigned Encoding, - Mangler *Mang, MachineModuleInfo *MMI) const; + getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI) const; }; @@ -183,8 +183,8 @@ public: // getCFIPersonalitySymbol - The symbol that gets passed to .cfi_personality. virtual MCSymbol * - getCFIPersonalitySymbol(const GlobalValue *GV, unsigned Encoding, - Mangler *Mang, MachineModuleInfo *MMI) const; + getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI) const; virtual unsigned getPersonalityEncoding() const; virtual unsigned getLSDAEncoding() const; diff --git a/include/llvm/Target/TargetLoweringObjectFile.h b/include/llvm/Target/TargetLoweringObjectFile.h index e4bbd018d7..360f3ceb2a 100644 --- a/include/llvm/Target/TargetLoweringObjectFile.h +++ b/include/llvm/Target/TargetLoweringObjectFile.h @@ -223,8 +223,8 @@ public: // getCFIPersonalitySymbol - The symbol that gets passed to .cfi_personality. virtual MCSymbol * - getCFIPersonalitySymbol(const GlobalValue *GV, unsigned Encoding, - Mangler *Mang, MachineModuleInfo *MMI) const; + getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI) const; /// const MCExpr * diff --git a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp index 5b92edeb29..1dcfddf1a1 100644 --- a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp @@ -109,8 +109,7 @@ void DwarfCFIException::BeginFunction(const MachineFunction *MF) { if (PerEncoding == dwarf::DW_EH_PE_omit || !Per) return; - const MCSymbol *Sym = TLOF.getCFIPersonalitySymbol(Per, PerEncoding, - Asm->Mang, MMI); + const MCSymbol *Sym = TLOF.getCFIPersonalitySymbol(Per, Asm->Mang, MMI); Asm->OutStreamer.EmitCFIPersonality(Sym, PerEncoding); } diff --git a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp index 1a4da73ffa..aff33aa9d5 100644 --- a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp +++ b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp @@ -179,9 +179,9 @@ const MCSection *TargetLoweringObjectFileELF::getEHFrameSection() const { MCSymbol * TargetLoweringObjectFileELF::getCFIPersonalitySymbol(const GlobalValue *GV, - unsigned Encoding, Mangler *Mang, MachineModuleInfo *MMI) const { + unsigned Encoding = getPersonalityEncoding(); switch (Encoding & 0x70) { default: report_fatal_error("We do not support this DWARF encoding yet!"); @@ -849,7 +849,7 @@ getExprForDwarfGlobalReference(const GlobalValue *GV, Mangler *Mang, } MCSymbol *TargetLoweringObjectFileMachO:: -getCFIPersonalitySymbol(const GlobalValue *GV, unsigned Encoding, Mangler *Mang, +getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, MachineModuleInfo *MMI) const { // The mach-o version of this method defaults to returning a stub reference. MachineModuleInfoMachO &MachOMMI = diff --git a/lib/Target/TargetLoweringObjectFile.cpp b/lib/Target/TargetLoweringObjectFile.cpp index 07f9773eb2..325493db25 100644 --- a/lib/Target/TargetLoweringObjectFile.cpp +++ b/lib/Target/TargetLoweringObjectFile.cpp @@ -121,7 +121,7 @@ static bool IsNullTerminatedString(const Constant *C) { } MCSymbol *TargetLoweringObjectFile:: -getCFIPersonalitySymbol(const GlobalValue *GV, unsigned Encoding, Mangler *Mang, +getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, MachineModuleInfo *MMI) const { return Mang->getSymbol(GV); } diff --git a/lib/Target/X86/X86TargetObjectFile.cpp b/lib/Target/X86/X86TargetObjectFile.cpp index 68c5aadcfc..b32fe79839 100644 --- a/lib/Target/X86/X86TargetObjectFile.cpp +++ b/lib/Target/X86/X86TargetObjectFile.cpp @@ -39,7 +39,7 @@ getExprForDwarfGlobalReference(const GlobalValue *GV, Mangler *Mang, } MCSymbol *X8664_MachoTargetObjectFile:: -getCFIPersonalitySymbol(const GlobalValue *GV, unsigned Encoding, Mangler *Mang, +getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, MachineModuleInfo *MMI) const { return Mang->getSymbol(GV); } diff --git a/lib/Target/X86/X86TargetObjectFile.h b/lib/Target/X86/X86TargetObjectFile.h index 7d14175271..e7ed014f12 100644 --- a/lib/Target/X86/X86TargetObjectFile.h +++ b/lib/Target/X86/X86TargetObjectFile.h @@ -29,8 +29,8 @@ namespace llvm { // getCFIPersonalitySymbol - The symbol that gets passed to // .cfi_personality. virtual MCSymbol * - getCFIPersonalitySymbol(const GlobalValue *GV, unsigned Encoding, - Mangler *Mang, MachineModuleInfo *MMI) const; + getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI) const; }; class X8632_ELFTargetObjectFile : public TargetLoweringObjectFileELF { |