[llvm] r256313 - Form reform for MCDwarf.
Eric Christopher via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 28 10:40:24 PST 2015
Hi Paul,
> + EmitAbbrev(MCOS, dwarf::DW_AT_ranges,
> + context.getDwarfVersion() >= 4 ? dwarf::DW_FORM_sec_offset
> + : dwarf::DW_FORM_data4);
>
Is this bit clang-formatted?
-eric
> } else {
> EmitAbbrev(MCOS, dwarf::DW_AT_low_pc, dwarf::DW_FORM_addr);
> EmitAbbrev(MCOS, dwarf::DW_AT_high_pc, dwarf::DW_FORM_addr);
>
> Modified: llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s?rev=256313&r1=256312&r2=256313&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s (original)
> +++ llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s Tue Dec
> 22 19:57:31 2015
> @@ -25,7 +25,7 @@ b:
>
> // DWARF: .debug_info contents:
> // DWARF: 0x{{[0-9a-f]+}}: DW_TAG_compile_unit [1]
> -// CHECK-NOT-DWARF: DW_TAG_
> +// DWARF-NOT: DW_TAG_
> // DWARF: DW_AT_low_pc [DW_FORM_addr]
> (0x0000000000000000)
> // DWARF: DW_AT_high_pc [DW_FORM_addr]
> (0x0000000000000004)
>
>
> Modified: llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s?rev=256313&r1=256312&r2=256313&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s (original)
> +++ llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s Tue Dec 22
> 19:57:31 2015
> @@ -1,6 +1,8 @@
> // RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g
> -fdebug-compilation-dir=/tmp
> -// RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF %s
> +// RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF -check-prefix
> DWARF4 %s
> // RUN: llvm-objdump -r %t | FileCheck -check-prefix RELOC %s
> +// RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g
> -dwarf-version 3 -fdebug-compilation-dir=/tmp
> +// RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF -check-prefix
> DWARF3 %s
> // RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g
> -dwarf-version 2 2>&1 | FileCheck -check-prefix VERSION %s
> // RUN: not llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t
> -g -dwarf-version 1 2>&1 | FileCheck -check-prefix DWARF1 %s
> // RUN: not llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t
> -g -dwarf-version 5 2>&1 | FileCheck -check-prefix DWARF5 %s
> @@ -15,8 +17,10 @@ b:
> // DWARF: .debug_abbrev contents:
> // DWARF: Abbrev table for offset: 0x00000000
> // DWARF: [1] DW_TAG_compile_unit DW_CHILDREN_yes
> -// DWARF: DW_AT_stmt_list DW_FORM_data4
> -// DWARF: DW_AT_ranges DW_FORM_data4
> +// DWARF3: DW_AT_stmt_list DW_FORM_data4
> +// DWARF4: DW_AT_stmt_list DW_FORM_sec_offset
> +// DWARF3: DW_AT_ranges DW_FORM_data4
> +// DWARF4: DW_AT_ranges DW_FORM_sec_offset
> // DWARF: DW_AT_name DW_FORM_string
> // DWARF: DW_AT_comp_dir DW_FORM_string
> // DWARF: DW_AT_producer DW_FORM_string
> @@ -24,8 +28,9 @@ b:
>
> // DWARF: .debug_info contents:
> // DWARF: 0x{{[0-9a-f]+}}: DW_TAG_compile_unit [1]
> -// CHECK-NOT-DWARF: DW_TAG_
> -// DWARF: DW_AT_ranges [DW_FORM_data4] (0x00000000
> +// DWARF-NOT: DW_TAG_
> +// DWARF3: DW_AT_ranges [DW_FORM_data4] (0x00000000
> +// DWARF4: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
>
> // DWARF: 0x{{[0-9a-f]+}}: DW_TAG_label [2] *
> // DWARF-NEXT: DW_AT_name [DW_FORM_string] ("a")
> @@ -41,10 +46,10 @@ b:
>
>
> // DWARF: .debug_line contents:
> -// DWARF: 0x0000000000000000 9 0 1 0 0 is_stmt
> -// DWARF-NEXT: 0x0000000000000004 9 0 1 0 0 is_stmt
> end_sequence
> -// DWARF-NEXT: 0x0000000000000000 13 0 1 0 0 is_stmt
> -// DWARF-NEXT: 0x0000000000000004 13 0 1 0 0 is_stmt
> end_sequence
> +// DWARF: 0x0000000000000000 11 0 1 0 0 is_stmt
> +// DWARF-NEXT: 0x0000000000000004 11 0 1 0 0 is_stmt
> end_sequence
> +// DWARF-NEXT: 0x0000000000000000 15 0 1 0 0 is_stmt
> +// DWARF-NEXT: 0x0000000000000004 15 0 1 0 0 is_stmt
> end_sequence
>
>
> // DWARF: .debug_ranges contents:
>
> Modified: llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s?rev=256313&r1=256312&r2=256313&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s (original)
> +++ llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s Tue Dec 22
> 19:57:31 2015
> @@ -9,7 +9,7 @@ b:
> // DWARF: .debug_abbrev contents:
> // DWARF: Abbrev table for offset: 0x00000000
> // DWARF: [1] DW_TAG_compile_unit DW_CHILDREN_yes
> -// DWARF: DW_AT_stmt_list DW_FORM_data4
> +// DWARF: DW_AT_stmt_list DW_FORM_sec_offset
> // DWARF: DW_AT_low_pc DW_FORM_addr
> // DWARF: DW_AT_high_pc DW_FORM_addr
> // DWARF: DW_AT_name DW_FORM_string
>
> Modified: llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s?rev=256313&r1=256312&r2=256313&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s (original)
> +++ llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s Tue Dec 22 19:57:31
> 2015
> @@ -10,7 +10,7 @@ a:
> // DWARF: .debug_abbrev contents:
> // DWARF: Abbrev table for offset: 0x00000000
> // DWARF: [1] DW_TAG_compile_unit DW_CHILDREN_yes
> -// DWARF: DW_AT_stmt_list DW_FORM_data4
> +// DWARF: DW_AT_stmt_list DW_FORM_sec_offset
> // DWARF: DW_AT_low_pc DW_FORM_addr
> // DWARF: DW_AT_high_pc DW_FORM_addr
> // DWARF: DW_AT_name DW_FORM_string
> @@ -20,7 +20,7 @@ a:
>
> // DWARF: .debug_info contents:
> // DWARF: 0x{{[0-9a-f]+}}: DW_TAG_compile_unit [1]
> -// CHECK-NOT-DWARF: DW_TAG_
> +// DWARF-NOT: DW_TAG_
> // DWARF: DW_AT_low_pc [DW_FORM_addr]
> (0x0000000000000000)
> // DWARF: DW_AT_high_pc [DW_FORM_addr]
> (0x0000000000000004)
>
>
> Modified: llvm/trunk/test/MC/MachO/gen-dwarf.s
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/gen-dwarf.s?rev=256313&r1=256312&r2=256313&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/MC/MachO/gen-dwarf.s (original)
> +++ llvm/trunk/test/MC/MachO/gen-dwarf.s Tue Dec 22 19:57:31 2015
> @@ -17,7 +17,7 @@ _x: .long 1
> // CHECK: .debug_abbrev contents:
> // CHECK: Abbrev table for offset: 0x00000000
> // CHECK: [1] DW_TAG_compile_unit DW_CHILDREN_yes
> -// CHECK: DW_AT_stmt_list DW_FORM_data4
> +// CHECK: DW_AT_stmt_list DW_FORM_sec_offset
> // CHECK: DW_AT_low_pc DW_FORM_addr
> // CHECK: DW_AT_high_pc DW_FORM_addr
> // CHECK: DW_AT_name DW_FORM_string
> @@ -39,7 +39,7 @@ _x: .long 1
>
> // We don't check the leading addresses these are at.
> // CHECK: DW_TAG_compile_unit [1] *
> -// CHECK: DW_AT_stmt_list [DW_FORM_data4] (0x00000000)
> +// CHECK: DW_AT_stmt_list [DW_FORM_sec_offset] (0x00000000)
> // CHECK: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
> // CHECK: DW_AT_high_pc [DW_FORM_addr] (0x0000000000000008)
> // We don't check the file name as it is a temp directory
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151228/195955c2/attachment.html>
More information about the llvm-commits
mailing list