Skip to content

Commit 86cd233

Browse files
aardappelaardappel
committed
[WebAssembly] Fixed DWARF DW_AT_low_pc encoded as 64-bit in wasm64
Also added general wasm64 DWARF test Also added asserts for unsupported reloc combinations that triggered this bug. Differential Revision: https://reviews.llvm.org/D90503
1 parent c116867 commit 86cd233

File tree

3 files changed

+114
-1
lines changed

3 files changed

+114
-1
lines changed

‎llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ WebAssemblyMCAsmInfo::~WebAssemblyMCAsmInfo() = default; // anchor.
2323

2424
WebAssemblyMCAsmInfo::WebAssemblyMCAsmInfo(const Triple &T,
2525
const MCTargetOptions &Options) {
26-
CodePointerSize = CalleeSaveStackSlotSize = T.isArch64Bit() ? 8 : 4;
26+
CalleeSaveStackSlotSize = T.isArch64Bit() ? 8 : 4;
27+
// So far this is used for DWARF DW_AT_low_pc which is always 32-bit in Wasm.
28+
CodePointerSize = 4;
2729

2830
// TODO: What should MaxInstLength be?
2931

‎llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,15 @@ unsigned WebAssemblyWasmObjectWriter::getRelocType(const MCValue &Target,
124124
case FK_Data_8:
125125
if (SymA.isFunction())
126126
return wasm::R_WASM_TABLE_INDEX_I64;
127+
if (SymA.isGlobal())
128+
llvm_unreachable("unimplemented R_WASM_GLOBAL_INDEX_I64");
129+
if (auto Section = static_cast<const MCSectionWasm *>(
130+
getFixupSection(Fixup.getValue()))) {
131+
if (Section->getKind().isText())
132+
llvm_unreachable("unimplemented R_WASM_FUNCTION_OFFSET_I64");
133+
else if (!Section->isWasmData())
134+
llvm_unreachable("unimplemented R_WASM_SECTION_OFFSET_I64");
135+
}
127136
assert(SymA.isData());
128137
return wasm::R_WASM_MEMORY_ADDR_I64;
129138
default:

‎llvm/test/MC/WebAssembly/dwarfdump64.ll

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2+
; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump --show-form - | FileCheck %s
3+
4+
; CHECK: .debug_info contents:
5+
; CHECK-NEXT: 0x00000000: Compile Unit: length = 0x0000006e, format = DWARF32, version = 0x0004, abbr_offset = 0x0000, addr_size = 0x04 (next unit at 0x00000072)
6+
7+
; CHECK: 0x0000000b: DW_TAG_compile_unit
8+
; CHECK-NEXT: DW_AT_producer [DW_FORM_strp] ("clang version 6.0.0 (trunk 315924) (llvm/trunk 315960)")
9+
; CHECK-NEXT: DW_AT_language [DW_FORM_data2] (DW_LANG_C99)
10+
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ("test.c")
11+
; CHECK-NEXT: DW_AT_stmt_list [DW_FORM_sec_offset] (0x00000000)
12+
; CHECK-NEXT: DW_AT_comp_dir [DW_FORM_strp] ("/usr/local/google/home/sbc/dev/wasm/simple")
13+
; CHECK-NEXT: DW_AT_GNU_pubnames [DW_FORM_flag_present] (true)
14+
; CHECK-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x00000002)
15+
; CHECK-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x00000002)
16+
17+
; CHECK: 0x00000026: DW_TAG_variable
18+
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ("foo")
19+
; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (0x00000037 "int*")
20+
; CHECK-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
21+
; CHECK-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/usr/local/google/home/sbc/dev/wasm/simple\test.c")
22+
; CHECK-NEXT: DW_AT_decl_line [DW_FORM_data1] (4)
23+
; CHECK-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)
24+
25+
; CHECK: 0x00000037: DW_TAG_pointer_type
26+
; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (0x0000003c "int")
27+
28+
; CHECK: 0x0000003c: DW_TAG_base_type
29+
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ("int")
30+
; CHECK-NEXT: DW_AT_encoding [DW_FORM_data1] (DW_ATE_signed)
31+
; CHECK-NEXT: DW_AT_byte_size [DW_FORM_data1] (0x04)
32+
33+
; CHECK: 0x00000043: DW_TAG_variable
34+
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ("ptr2")
35+
; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (0x00000054 "void()*")
36+
; CHECK-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
37+
; CHECK-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/usr/local/google/home/sbc/dev/wasm/simple\test.c")
38+
; CHECK-NEXT: DW_AT_decl_line [DW_FORM_data1] (5)
39+
40+
41+
42+
; TODO: is this correct?
43+
44+
; CHECK-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x8)
45+
46+
; CHECK: 0x00000054: DW_TAG_pointer_type
47+
; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (0x00000059 "void()")
48+
49+
; CHECK: 0x00000059: DW_TAG_subroutine_type
50+
; CHECK-NEXT: DW_AT_prototyped [DW_FORM_flag_present] (true)
51+
52+
; CHECK: 0x0000005a: DW_TAG_subprogram
53+
; CHECK-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x00000002)
54+
; CHECK-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x00000002)
55+
; CHECK-NEXT: DW_AT_frame_base [DW_FORM_exprloc] (DW_OP_WASM_location 0x3 0x0, DW_OP_stack_value)
56+
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ("f2")
57+
; CHECK-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/usr/local/google/home/sbc/dev/wasm/simple\test.c")
58+
; CHECK-NEXT: DW_AT_decl_line [DW_FORM_data1] (2)
59+
; CHECK-NEXT: DW_AT_prototyped [DW_FORM_flag_present] (true)
60+
; CHECK-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
61+
62+
; CHECK: 0x00000071: NULL
63+
64+
target triple = "wasm64-unknown-unknown"
65+
66+
source_filename = "test.c"
67+
68+
@myextern = external global i32, align 4
69+
@foo = hidden global i32* @myextern, align 4, !dbg !0
70+
@ptr2 = hidden global void ()* @f2, align 4, !dbg !6
71+
72+
; Function Attrs: noinline nounwind optnone
73+
define hidden void @f2() #0 !dbg !17 {
74+
entry:
75+
ret void, !dbg !18
76+
}
77+
78+
attributes #0 = { noinline nounwind optnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="generic" "unsafe-fp-math"="false" "use-soft-float"="false" }
79+
80+
!llvm.dbg.cu = !{!2}
81+
!llvm.module.flags = !{!13, !14, !15}
82+
!llvm.ident = !{!16}
83+
84+
!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
85+
!1 = distinct !DIGlobalVariable(name: "foo", scope: !2, file: !3, line: 4, type: !11, isLocal: false, isDefinition: true)
86+
!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 6.0.0 (trunk 315924) (llvm/trunk 315960)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5)
87+
!3 = !DIFile(filename: "test.c", directory: "/usr/local/google/home/sbc/dev/wasm/simple")
88+
!4 = !{}
89+
!5 = !{!0, !6}
90+
!6 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression())
91+
!7 = distinct !DIGlobalVariable(name: "ptr2", scope: !2, file: !3, line: 5, type: !8, isLocal: false, isDefinition: true)
92+
!8 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !9, size: 64)
93+
!9 = !DISubroutineType(types: !10)
94+
!10 = !{null}
95+
!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
96+
!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
97+
!13 = !{i32 2, !"Dwarf Version", i32 4}
98+
!14 = !{i32 2, !"Debug Info Version", i32 3}
99+
!15 = !{i32 1, !"wchar_size", i32 4}
100+
!16 = !{!"clang version 6.0.0 (trunk 315924) (llvm/trunk 315960)"}
101+
!17 = distinct !DISubprogram(name: "f2", scope: !3, file: !3, line: 2, type: !9, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: false, unit: !2, retainedNodes: !4)
102+
!18 = !DILocation(line: 2, column: 16, scope: !17)

0 commit comments

Comments
 (0)