From 6af22f02ef7b06adab142a7042c40e83bb788fb5 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 21 Aug 2009 23:08:09 +0000 Subject: revert 79631 llvm-svn: 79685 --- llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp | 20 +++++--------------- llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) (limited to 'llvm/lib/Target/PIC16/AsmPrinter') diff --git a/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp b/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp index 65309ea6750..b96ae54005e 100644 --- a/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp +++ b/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp @@ -73,7 +73,7 @@ bool PIC16AsmPrinter::runOnMachineFunction(MachineFunction &MF) { DbgInfo.BeginFunction(MF); // Emit the autos section of function. - EmitAutos(F); + EmitAutos(CurrentFnName); // Now emit the instructions of function in its code section. const MCSection *fCodeSection = @@ -362,10 +362,9 @@ void PIC16AsmPrinter::EmitFunctionFrame(MachineFunction &MF) { const TargetData *TD = TM.getTargetData(); // Emit the data section name. O << "\n"; - - std::string SectionName = getObjFileLowering().getNameForFunctFrame(F); + const MCSection *fPDataSection = - getObjFileLowering().getSectionForFunctionFrame(SectionName); + getObjFileLowering().getSectionForFunctionFrame(CurrentFnName); OutStreamer.SwitchSection(fPDataSection); // Emit function frame label @@ -441,12 +440,12 @@ void PIC16AsmPrinter::EmitUData(Module &M) { } } -void PIC16AsmPrinter::EmitAutos(const Function *F) { +void PIC16AsmPrinter::EmitAutos(std::string FunctName) { // Section names for all globals are already set. const TargetData *TD = TM.getTargetData(); // Now print Autos section for this function. - std::string SectionName = PAN::getAutosSectionName(CurrentFnName); + std::string SectionName = PAN::getAutosSectionName(FunctName); // If this function is a cloned function then the name of auto section // will not be present in the list of existing section. Hence this section @@ -460,15 +459,6 @@ void PIC16AsmPrinter::EmitAutos(const Function *F) { if (AutosSections[i]->S_->getName() == SectionName) { // Set the printing status to true AutosSections[i]->setPrintedStatus(true); - // Overlay auto sections with same function color. - std::string BaseSectionName = getObjFileLowering(). - getNameForFunctFrame(F, true); - if (BaseSectionName != F->getName()) { - std::string NewSectionName = PAN::getAutosSectionName(BaseSectionName); - const_cast(AutosSections[i]->S_)->setName( - NewSectionName); - } - OutStreamer.SwitchSection(AutosSections[i]->S_); const std::vector &Items = AutosSections[i]->Items; for (unsigned j = 0; j < Items.size(); j++) { diff --git a/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h b/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h index ece19ca2609..55a2fcf85a6 100644 --- a/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h +++ b/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h @@ -52,7 +52,7 @@ namespace llvm { void EmitDefinedVars (Module &M); void EmitIData (Module &M); void EmitUData (Module &M); - void EmitAutos (const Function *F); + void EmitAutos (std::string FunctName); void EmitRemainingAutos (); void EmitRomData (Module &M); void EmitFunctionFrame(MachineFunction &MF); -- cgit v1.2.3