diff options
Diffstat (limited to 'lib/CodeGen')
-rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfCFIException.cpp | 3 | ||||
-rw-r--r-- | lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
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 = |