diff options
| author | Bill Wendling <isanbard@gmail.com> | 2009-04-10 00:12:49 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2009-04-10 00:12:49 +0000 |
| commit | 7d16e85bfc2c6423c81ce87a177bf3b1b1012a04 (patch) | |
| tree | d4b0115b91062d7788802f5c67d9a4bceba7ac5f /lib/CodeGen/AsmPrinter/DwarfWriter.cpp | |
| parent | a6f02fbb7523535da75d27c113a0e308cb05ac8c (diff) | |
Pass in the std::string parameter instead of returning it by value.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@68747 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/AsmPrinter/DwarfWriter.cpp')
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfWriter.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp index 508d4022db..d59609b371 100644 --- a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp @@ -2888,8 +2888,9 @@ private: // Add address. DIEBlock *Block = new DIEBlock(); AddUInt(Block, 0, DW_FORM_data1, DW_OP_addr); + std::string GLN; AddObjectLabel(Block, 0, DW_FORM_udata, - Asm->getGlobalLinkName(DI_GV.getGlobal())); + Asm->getGlobalLinkName(DI_GV.getGlobal(), GLN)); AddBlock(VariableDie, DW_AT_location, 0, Block); // Add to map. @@ -4009,10 +4010,12 @@ class DwarfException : public Dwarf { PrintRelDirective(); - if (GV) - O << Asm->getGlobalLinkName(GV); - else + if (GV) { + std::string GLN; + O << Asm->getGlobalLinkName(GV, GLN); + } else { O << "0"; + } Asm->EOL("TypeInfo"); } @@ -4120,14 +4123,15 @@ public: EmitExceptionTable(); // Save EH frame information - EHFrames. - push_back(FunctionEHFrameInfo(getAsm()->getCurrentFunctionEHName(MF), - SubprogramCount, - MMI->getPersonalityIndex(), - MF->getFrameInfo()->hasCalls(), - !MMI->getLandingPads().empty(), - MMI->getFrameMoves(), - MF->getFunction())); + std::string Name; + EHFrames.push_back( + FunctionEHFrameInfo(getAsm()->getCurrentFunctionEHName(MF, Name), + SubprogramCount, + MMI->getPersonalityIndex(), + MF->getFrameInfo()->hasCalls(), + !MMI->getLandingPads().empty(), + MMI->getFrameMoves(), + MF->getFunction())); } if (TimePassesIsEnabled) |