diff options
| author | David Blaikie <dblaikie@gmail.com> | 2014-03-07 18:04:24 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2014-03-07 18:04:24 +0000 |
| commit | d723f5186e3ea42dfd12dd3da1efe1a8af6e8246 (patch) | |
| tree | b7ff7028e27c42f31dd0a956b1b1b11430618988 | |
| parent | 43b68bebe708fee758a3c93534118c853bb1b230 (diff) | |
| download | llvm-d723f5186e3ea42dfd12dd3da1efe1a8af6e8246.zip llvm-d723f5186e3ea42dfd12dd3da1efe1a8af6e8246.tar.gz llvm-d723f5186e3ea42dfd12dd3da1efe1a8af6e8246.tar.bz2 | |
DebugInfo: Restrict DW_AT_high_pc encoding as data4 offset to DWARF 4 as per spec
Code review feedback to r203187 from Oliver Stannard. Thanks!
llvm-svn: 203256
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/AArch64/dwarfdump.ll | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 84c486c..882720f 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -413,7 +413,7 @@ DIE *DwarfDebug::updateSubprogramScopeDIE(DwarfCompileUnit *SPCU, } SPCU->addLabelAddress(SPDie, dwarf::DW_AT_low_pc, FunctionBeginSym); - if (Triple(Asm->getTargetTriple()).isOSDarwin()) + if (DwarfVersion < 4 || Triple(Asm->getTargetTriple()).isOSDarwin()) SPCU->addLabelAddress(SPDie, dwarf::DW_AT_high_pc, FunctionEndSym); else SPCU->addLabelDelta(SPDie, dwarf::DW_AT_high_pc, FunctionEndSym, diff --git a/llvm/test/DebugInfo/AArch64/dwarfdump.ll b/llvm/test/DebugInfo/AArch64/dwarfdump.ll index b30bd33..98e863d 100644 --- a/llvm/test/DebugInfo/AArch64/dwarfdump.ll +++ b/llvm/test/DebugInfo/AArch64/dwarfdump.ll @@ -1,4 +1,7 @@ -; RUN: llc -mtriple=aarch64-non-linux-gnu < %s -filetype=obj | llvm-dwarfdump - | FileCheck %s +; RUN: llc -mtriple=aarch64-non-linux-gnu -dwarf-version=4 < %s -filetype=obj \ +; RUN: | llvm-dwarfdump - | FileCheck -check-prefix=CHECK -check-prefix=CHECK-4 %s +; RUN: llc -mtriple=aarch64-non-linux-gnu -dwarf-version=3 < %s -filetype=obj \ +; RUN: | llvm-dwarfdump - | FileCheck -check-prefix=CHECK -check-prefix=CHECK-3 %s ; We're mostly checking that relocations are applied correctly ; here. Currently R_AARCH64_ABS32 is used for references to debug data @@ -12,7 +15,8 @@ ; A couple of ABS64s similarly: ; CHECK: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000) -; CHECK: DW_AT_high_pc [DW_FORM_data4] (0x00000008) +; CHECK-4: DW_AT_high_pc [DW_FORM_data4] (0x00000008) +; CHECK-3: DW_AT_high_pc [DW_FORM_addr] (0x0000000000000008) define i32 @main() nounwind { ret i32 0, !dbg !8 |