[llvm] r189903 - Remove the darwin gdb option, that version of gdb is now dead and
Eric Christopher
echristo at gmail.com
Tue Sep 3 21:38:46 PDT 2013
Can only fix things that send me mail :p
And yeah, those should either be migrated to use lldb or removed.
-eric
On Tue, Sep 3, 2013 at 9:34 PM, Michael Gottesman <mgottesman at apple.com> wrote:
> Getting a phase 1 failure:
>
> http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/6684
>
> Its been broken for a while so I reverted in r189913.
>
> Michael
>
> On Sep 3, 2013, at 7:02 PM, Eric Christopher <echristo at gmail.com> wrote:
>
>> Author: echristo
>> Date: Tue Sep 3 21:02:10 2013
>> New Revision: 189903
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=189903&view=rev
>> Log:
>> Remove the darwin gdb option, that version of gdb is now dead and
>> the rest of the compatibility should be done on a dwarf-N level.
>>
>> Modified:
>> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
>> llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll
>> llvm/trunk/test/DebugInfo/X86/linkage-name.ll
>>
>> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=189903&r1=189902&r2=189903&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Tue Sep 3 21:02:10 2013
>> @@ -100,7 +100,7 @@ int64_t CompileUnit::getDefaultLowerBoun
>>
>> /// addFlag - Add a flag that is true.
>> void CompileUnit::addFlag(DIE *Die, uint16_t Attribute) {
>> - if (!DD->useDarwinGDBCompat())
>> + if (DD->getDwarfVersion() >= 4)
>> Die->addValue(Attribute, dwarf::DW_FORM_flag_present,
>> DIEIntegerOne);
>> else
>> @@ -1242,17 +1242,6 @@ DIE *CompileUnit::getOrCreateSubprogramD
>> // Add function template parameters.
>> addTemplateParams(*SPDie, SP.getTemplateParams());
>>
>> - // Unfortunately this code needs to stay here instead of below the
>> - // AT_specification code in order to work around a bug in older
>> - // gdbs that requires the linkage name to resolve multiple template
>> - // functions.
>> - // TODO: Remove this set of code when we get rid of the old gdb
>> - // compatibility.
>> - StringRef LinkageName = SP.getLinkageName();
>> - if (!LinkageName.empty() && DD->useDarwinGDBCompat())
>> - addString(SPDie, dwarf::DW_AT_MIPS_linkage_name,
>> - GlobalValue::getRealLinkageName(LinkageName));
>> -
>> // If this DIE is going to refer declaration info using AT_specification
>> // then there is no need to add other attributes.
>> if (DeclDie) {
>> @@ -1264,7 +1253,8 @@ DIE *CompileUnit::getOrCreateSubprogramD
>> }
>>
>> // Add the linkage name if we have one.
>> - if (!LinkageName.empty() && !DD->useDarwinGDBCompat())
>> + StringRef LinkageName = SP.getLinkageName();
>> + if (!LinkageName.empty())
>> addString(SPDie, dwarf::DW_AT_MIPS_linkage_name,
>> GlobalValue::getRealLinkageName(LinkageName));
>>
>> @@ -1459,21 +1449,15 @@ void CompileUnit::createGlobalVariableDI
>> } else {
>> addBlock(VariableDIE, dwarf::DW_AT_location, 0, Block);
>> }
>> - // Add linkage name.
>> + // Add the linkage name.
>> StringRef LinkageName = GV.getLinkageName();
>> - if (!LinkageName.empty()) {
>> + if (!LinkageName.empty())
>> // From DWARF4: DIEs to which DW_AT_linkage_name may apply include:
>> // TAG_common_block, TAG_constant, TAG_entry_point, TAG_subprogram and
>> // TAG_variable.
>> addString(IsStaticMember && VariableSpecDIE ?
>> VariableSpecDIE : VariableDIE, dwarf::DW_AT_MIPS_linkage_name,
>> GlobalValue::getRealLinkageName(LinkageName));
>> - // In compatibility mode with older gdbs we put the linkage name on both
>> - // the TAG_variable DIE and on the TAG_member DIE.
>> - if (IsStaticMember && VariableSpecDIE && DD->useDarwinGDBCompat())
>> - addString(VariableDIE, dwarf::DW_AT_MIPS_linkage_name,
>> - GlobalValue::getRealLinkageName(LinkageName));
>> - }
>> } else if (const ConstantInt *CI =
>> dyn_cast_or_null<ConstantInt>(GV.getConstant())) {
>> // AT_const_value was added when the static member was created. To avoid
>>
>> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=189903&r1=189902&r2=189903&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Sep 3 21:02:10 2013
>> @@ -85,14 +85,6 @@ DwarfAccelTables("dwarf-accel-tables", c
>> cl::init(Default));
>>
>> static cl::opt<DefaultOnOff>
>> -DarwinGDBCompat("darwin-gdb-compat", cl::Hidden,
>> - cl::desc("Compatibility with Darwin gdb."),
>> - cl::values(clEnumVal(Default, "Default for platform"),
>> - clEnumVal(Enable, "Enabled"),
>> - clEnumVal(Disable, "Disabled"), clEnumValEnd),
>> - cl::init(Default));
>> -
>> -static cl::opt<DefaultOnOff>
>> SplitDwarf("split-dwarf", cl::Hidden,
>> cl::desc("Output prototype dwarf split debug info."),
>> cl::values(clEnumVal(Default, "Default for platform"),
>> @@ -206,11 +198,6 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Mo
>> // and handle split dwarf.
>> bool IsDarwin = Triple(A->getTargetTriple()).isOSDarwin();
>>
>> - if (DarwinGDBCompat == Default)
>> - IsDarwinGDBCompat = IsDarwin;
>> - else
>> - IsDarwinGDBCompat = DarwinGDBCompat == Enable;
>> -
>> if (DwarfAccelTables == Default)
>> HasDwarfAccelTables = IsDarwin;
>> else
>> @@ -1898,10 +1885,10 @@ void DwarfDebug::emitSectionLabels() {
>> DwarfLineSectionSym =
>> emitSectionSym(Asm, TLOF.getDwarfLineSection(), "section_line");
>> emitSectionSym(Asm, TLOF.getDwarfLocSection());
>> - if (HasDwarfPubSections)
>> + if (HasDwarfPubSections) {
>> emitSectionSym(Asm, TLOF.getDwarfPubNamesSection());
>> - if (useDarwinGDBCompat() || HasDwarfPubSections)
>> emitSectionSym(Asm, TLOF.getDwarfPubTypesSection());
>> + }
>> DwarfStrSectionSym =
>> emitSectionSym(Asm, TLOF.getDwarfStrSection(), "info_string");
>> if (useSplitDwarf()) {
>>
>> Modified: llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll?rev=189903&r1=189902&r2=189903&view=diff
>> ==============================================================================
>> --- llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll (original)
>> +++ llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll Tue Sep 3 21:02:10 2013
>> @@ -151,7 +151,6 @@ declare void @llvm.dbg.declare(metadata,
>> ; DARWINP: DW_AT_external
>> ; DARWINP: DW_AT_declaration
>> ; DARWINP: DW_AT_accessibility [DW_FORM_data1] (0x03)
>> -; DARWINP: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1aE"
>> ; DARWINP: DW_TAG_member
>> ; DARWINP-NEXT: DW_AT_name {{.*}} "const_a"
>> ; DARWINP: DW_AT_external
>> @@ -161,7 +160,6 @@ declare void @llvm.dbg.declare(metadata,
>> ; DARWINP: 0x[[DECL_B:[0-9a-f]+]]: DW_TAG_member
>> ; DARWINP-NEXT: DW_AT_name {{.*}} "b"
>> ; DARWINP: DW_AT_accessibility [DW_FORM_data1] (0x02)
>> -; DARWINP: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1bE"
>> ; DARWINP: DW_TAG_member
>> ; DARWINP-NEXT: DW_AT_name {{.*}} "const_b"
>> ; DARWINP: DW_AT_accessibility [DW_FORM_data1] (0x02)
>> @@ -169,7 +167,6 @@ declare void @llvm.dbg.declare(metadata,
>> ; DARWINP: 0x[[DECL_C:[0-9a-f]+]]: DW_TAG_member
>> ; DARWINP-NEXT: DW_AT_name {{.*}} "c"
>> ; DARWINP: DW_AT_accessibility [DW_FORM_data1] (0x01)
>> -; DARWINP: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1cE"
>> ; DARWINP: DW_TAG_member
>> ; DARWINP-NEXT: DW_AT_name {{.*}} "const_c"
>> ; DARWINP: DW_AT_accessibility [DW_FORM_data1] (0x01)
>>
>> Modified: llvm/trunk/test/DebugInfo/X86/linkage-name.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/linkage-name.ll?rev=189903&r1=189902&r2=189903&view=diff
>> ==============================================================================
>> --- llvm/trunk/test/DebugInfo/X86/linkage-name.ll (original)
>> +++ llvm/trunk/test/DebugInfo/X86/linkage-name.ll Tue Sep 3 21:02:10 2013
>> @@ -1,4 +1,4 @@
>> -; RUN: llc -mtriple=x86_64-macosx -darwin-gdb-compat=Disable %s -o %t -filetype=obj
>> +; RUN: llc -mtriple=x86_64-macosx %s -o %t -filetype=obj
>> ; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s
>>
>> ; CHECK: DW_TAG_subprogram [9] *
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
More information about the llvm-commits
mailing list