maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[DebugInfo] Remove dots from getFilenameByIndex return value" 

This is failing on Windows bots due to path separator normalization.

This reverts commit 042c235068.
This commit is contained in:
Petr Hosek 2020-09-15 10:06:15 -07:00
parent 4452cc4086
commit 9c73e55510
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lld/test/COFF/duplicate-dwarf.s
View File

@ -4,21 +4,21 @@
# RUN: not lld-link -lldmingw -out:%t.exe %t.o %t.dupl.o -entry:_Z4funcv 2>&1 | FileCheck %s
# CHECK: error: duplicate symbol: func()
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:6
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:6
# CHECK-NEXT: >>> {{.*}}.o
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:6
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:6
# CHECK-NEXT: >>> {{.*}}.o
# CHECK-EMPTY:
# CHECK-NEXT: error: duplicate symbol: _var
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:1
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:1
# CHECK-NEXT: >>> {{.*}}.o
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:1
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:1
# CHECK-NEXT: >>> {{.*}}.o
# CHECK-EMPTY:
# CHECK-NEXT: error: duplicate symbol: A::namespaceVar
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:3
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:3
# CHECK-NEXT: >>> {{.*}}.o
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:3
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:3
# CHECK-NEXT: >>> {{.*}}.o
.text

4
lld/test/COFF/undefined-symbol-dwarf.s
View File

@ -3,11 +3,11 @@
# RUN: not lld-link /lldmingw /out:%t.exe %t.o /entry:entry 2>&1 | FileCheck %s
# CHECK: error: undefined symbol: bar()
# CHECK-NEXT: >>> referenced by /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}undef.cpp:17
# CHECK-NEXT: >>> referenced by /path/to/src{{[/\\]}}undef.cpp:17
# CHECK-NEXT: >>> {{.*}}.o:(entry)
# CHECK-EMPTY:
# CHECK-NEXT: error: undefined symbol: foo()
# CHECK-NEXT: >>> referenced by /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}undef.cpp:7
# CHECK-NEXT: >>> referenced by /path/to/src{{[/\\]}}undef.cpp:7
# CHECK-NEXT: >>> {{.*}}.o:(A::afunc())
.text

4
lld/test/ELF/conflict-debug-variable2.s
View File

@ -7,14 +7,14 @@
# INPUT-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000027] = "foo")
# INPUT-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0033 => {0x00000033} "int")
# INPUT-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home{{(/|\\)}}path{{(/|\\)}}test.c")
# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/path/test.c")
# INPUT-NEXT: DW_AT_decl_line [DW_FORM_data1] (1)
# INPUT-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)
# INPUT: DW_TAG_variable
# INPUT-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000002f] = "bar")
# INPUT-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0033 => {0x00000033} "int")
# INPUT-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home{{(/|\\)}}path{{(/|\\)}}test.c")
# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/path/test.c")
# INPUT-NEXT: DW_AT_decl_line [DW_FORM_data1] (2)
# INPUT-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)

6
lld/test/wasm/debuginfo.test
View File

@ -16,13 +16,13 @@ CHECK-NEXT: DW_AT_low_pc
CHECK-NEXT: DW_AT_high_pc
CHECK-NEXT: DW_AT_frame_base
CHECK-NEXT: DW_AT_name ("test")
CHECK-NEXT: DW_AT_decl_file ("/Users{{(/|\\)}}yury{{(/|\\)}}llvmwasm{{(/|\\)}}hi.c")
CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
CHECK-NEXT: DW_AT_decl_line (3)
CHECK-NEXT: DW_AT_prototyped (true)
CHECK: DW_TAG_formal_parameter
CHECK-NEXT: DW_AT_name ("t")
CHECK-NEXT: DW_AT_decl_file ("/Users{{(/|\\)}}yury{{(/|\\)}}llvmwasm{{(/|\\)}}hi.c")
CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
CHECK-NEXT: DW_AT_decl_line (3)
CHECK: DW_TAG_subprogram
@ -30,7 +30,7 @@ CHECK-NEXT: DW_AT_low_pc
CHECK-NEXT: DW_AT_high_pc
CHECK-NEXT: DW_AT_frame_base
CHECK-NEXT: DW_AT_name ("_start")
CHECK-NEXT: DW_AT_decl_file ("/Users{{(/|\\)}}yury{{(/|\\)}}llvmwasm{{(/|\\)}}hi.c")
CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
CHECK-NEXT: DW_AT_decl_line (7)
CHECK: DW_TAG_base_type

1
llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
View File

@ -1391,7 +1391,6 @@ bool DWARFDebugLine::Prologue::getFileNameByIndex(
// sys::path::append skips empty strings.
sys::path::append(FilePath, Style, IncludeDir, FileName);
sys::path::remove_dots(FilePath, /*remove_dot_dot=*/true, Style);
Result = std::string(FilePath.str());
return true;
}

2
llvm/test/tools/llvm-symbolizer/frame-fortran.s
View File

@ -13,7 +13,7 @@
// CHECK: foo
// CHECK-NEXT: array
// CHECK-NEXT: /home/ubuntu{{/|\\}}example.cpp:1
// CHECK-NEXT: /home/ubuntu{{/|\\}}.{{/|\\}}example.cpp:1
// CHECK-NEXT: -24 8 ??
.file "example.cpp"