<div dir="ltr">Hi Paul,<div><br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
+ EmitAbbrev(MCOS, dwarf::DW_AT_ranges,<br>
+ context.getDwarfVersion() >= 4 ? dwarf::DW_FORM_sec_offset<br>
+ : dwarf::DW_FORM_data4);<br>
</blockquote><div><br></div><div>Is this bit clang-formatted?</div><div><br></div><div>-eric</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> } else {<br>
EmitAbbrev(MCOS, dwarf::DW_AT_low_pc, dwarf::DW_FORM_addr);<br>
EmitAbbrev(MCOS, dwarf::DW_AT_high_pc, dwarf::DW_FORM_addr);<br>
<br>
Modified: llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s (original)<br>
+++ llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s Tue Dec 22 19:57:31 2015<br>
@@ -25,7 +25,7 @@ b:<br>
<br>
// DWARF: .debug_info contents:<br>
// DWARF: 0x{{[0-9a-f]+}}: DW_TAG_compile_unit [1]<br>
-// CHECK-NOT-DWARF: DW_TAG_<br>
+// DWARF-NOT: DW_TAG_<br>
// DWARF: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)<br>
// DWARF: DW_AT_high_pc [DW_FORM_addr] (0x0000000000000004)<br>
<br>
<br>
Modified: llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s?rev=256313&r1=256312&r2=256313&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s?rev=256313&r1=256312&r2=256313&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s (original)<br>
+++ llvm/trunk/test/MC/ARM/dwarf-asm-multiple-sections.s Tue Dec 22 19:57:31 2015<br>
@@ -1,6 +1,8 @@<br>
// RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -fdebug-compilation-dir=/tmp<br>
-// RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF %s<br>
+// RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF -check-prefix DWARF4 %s<br>
// RUN: llvm-objdump -r %t | FileCheck -check-prefix RELOC %s<br>
+// RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -dwarf-version 3 -fdebug-compilation-dir=/tmp<br>
+// RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF -check-prefix DWARF3 %s<br>
// RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -dwarf-version 2 2>&1 | FileCheck -check-prefix VERSION %s<br>
// RUN: not llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -dwarf-version 1 2>&1 | FileCheck -check-prefix DWARF1 %s<br>
// RUN: not llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -dwarf-version 5 2>&1 | FileCheck -check-prefix DWARF5 %s<br>
@@ -15,8 +17,10 @@ b:<br>
// DWARF: .debug_abbrev contents:<br>
// DWARF: Abbrev table for offset: 0x00000000<br>
// DWARF: [1] DW_TAG_compile_unit DW_CHILDREN_yes<br>
-// DWARF: DW_AT_stmt_list DW_FORM_data4<br>
-// DWARF: DW_AT_ranges DW_FORM_data4<br>
+// DWARF3: DW_AT_stmt_list DW_FORM_data4<br>
+// DWARF4: DW_AT_stmt_list DW_FORM_sec_offset<br>
+// DWARF3: DW_AT_ranges DW_FORM_data4<br>
+// DWARF4: DW_AT_ranges DW_FORM_sec_offset<br>
// DWARF: DW_AT_name DW_FORM_string<br>
// DWARF: DW_AT_comp_dir DW_FORM_string<br>
// DWARF: DW_AT_producer DW_FORM_string<br>
@@ -24,8 +28,9 @@ b:<br>
<br>
// DWARF: .debug_info contents:<br>
// DWARF: 0x{{[0-9a-f]+}}: DW_TAG_compile_unit [1]<br>
-// CHECK-NOT-DWARF: DW_TAG_<br>
-// DWARF: DW_AT_ranges [DW_FORM_data4] (0x00000000<br>
+// DWARF-NOT: DW_TAG_<br>
+// DWARF3: DW_AT_ranges [DW_FORM_data4] (0x00000000<br>
+// DWARF4: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000<br>
<br>
// DWARF: 0x{{[0-9a-f]+}}: DW_TAG_label [2] *<br>
// DWARF-NEXT: DW_AT_name [DW_FORM_string] ("a")<br>
@@ -41,10 +46,10 @@ b:<br>
<br>
<br>
// DWARF: .debug_line contents:<br>
-// DWARF: 0x0000000000000000 9 0 1 0 0 is_stmt<br>
-// DWARF-NEXT: 0x0000000000000004 9 0 1 0 0 is_stmt end_sequence<br>
-// DWARF-NEXT: 0x0000000000000000 13 0 1 0 0 is_stmt<br>
-// DWARF-NEXT: 0x0000000000000004 13 0 1 0 0 is_stmt end_sequence<br>
+// DWARF: 0x0000000000000000 11 0 1 0 0 is_stmt<br>
+// DWARF-NEXT: 0x0000000000000004 11 0 1 0 0 is_stmt end_sequence<br>
+// DWARF-NEXT: 0x0000000000000000 15 0 1 0 0 is_stmt<br>
+// DWARF-NEXT: 0x0000000000000004 15 0 1 0 0 is_stmt end_sequence<br>
<br>
<br>
// DWARF: .debug_ranges contents:<br>
<br>
Modified: llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s?rev=256313&r1=256312&r2=256313&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s?rev=256313&r1=256312&r2=256313&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s (original)<br>
+++ llvm/trunk/test/MC/ARM/dwarf-asm-nonstandard-section.s Tue Dec 22 19:57:31 2015<br>
@@ -9,7 +9,7 @@ b:<br>
// DWARF: .debug_abbrev contents:<br>
// DWARF: Abbrev table for offset: 0x00000000<br>
// DWARF: [1] DW_TAG_compile_unit DW_CHILDREN_yes<br>
-// DWARF: DW_AT_stmt_list DW_FORM_data4<br>
+// DWARF: DW_AT_stmt_list DW_FORM_sec_offset<br>
// DWARF: DW_AT_low_pc DW_FORM_addr<br>
// DWARF: DW_AT_high_pc DW_FORM_addr<br>
// DWARF: DW_AT_name DW_FORM_string<br>
<br>
Modified: llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s?rev=256313&r1=256312&r2=256313&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s?rev=256313&r1=256312&r2=256313&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s (original)<br>
+++ llvm/trunk/test/MC/ARM/dwarf-asm-single-section.s Tue Dec 22 19:57:31 2015<br>
@@ -10,7 +10,7 @@ a:<br>
// DWARF: .debug_abbrev contents:<br>
// DWARF: Abbrev table for offset: 0x00000000<br>
// DWARF: [1] DW_TAG_compile_unit DW_CHILDREN_yes<br>
-// DWARF: DW_AT_stmt_list DW_FORM_data4<br>
+// DWARF: DW_AT_stmt_list DW_FORM_sec_offset<br>
// DWARF: DW_AT_low_pc DW_FORM_addr<br>
// DWARF: DW_AT_high_pc DW_FORM_addr<br>
// DWARF: DW_AT_name DW_FORM_string<br>
@@ -20,7 +20,7 @@ a:<br>
<br>
// DWARF: .debug_info contents:<br>
// DWARF: 0x{{[0-9a-f]+}}: DW_TAG_compile_unit [1]<br>
-// CHECK-NOT-DWARF: DW_TAG_<br>
+// DWARF-NOT: DW_TAG_<br>
// DWARF: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)<br>
// DWARF: DW_AT_high_pc [DW_FORM_addr] (0x0000000000000004)<br>
<br>
<br>
Modified: llvm/trunk/test/MC/MachO/gen-dwarf.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/gen-dwarf.s?rev=256313&r1=256312&r2=256313&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/gen-dwarf.s?rev=256313&r1=256312&r2=256313&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/MachO/gen-dwarf.s (original)<br>
+++ llvm/trunk/test/MC/MachO/gen-dwarf.s Tue Dec 22 19:57:31 2015<br>
@@ -17,7 +17,7 @@ _x: .long 1<br>
// CHECK: .debug_abbrev contents:<br>
// CHECK: Abbrev table for offset: 0x00000000<br>
// CHECK: [1] DW_TAG_compile_unit DW_CHILDREN_yes<br>
-// CHECK: DW_AT_stmt_list DW_FORM_data4<br>
+// CHECK: DW_AT_stmt_list DW_FORM_sec_offset<br>
// CHECK: DW_AT_low_pc DW_FORM_addr<br>
// CHECK: DW_AT_high_pc DW_FORM_addr<br>
// CHECK: DW_AT_name DW_FORM_string<br>
@@ -39,7 +39,7 @@ _x: .long 1<br>
<br>
// We don't check the leading addresses these are at.<br>
// CHECK: DW_TAG_compile_unit [1] *<br>
-// CHECK: DW_AT_stmt_list [DW_FORM_data4] (0x00000000)<br>
+// CHECK: DW_AT_stmt_list [DW_FORM_sec_offset] (0x00000000)<br>
// CHECK: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)<br>
// CHECK: DW_AT_high_pc [DW_FORM_addr] (0x0000000000000008)<br>
// We don't check the file name as it is a temp directory<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div></div>