This is an archive of the discontinued LLVM Phabricator instance.

Differential D57552

Handle "." in target.source-map in PathMapListing::FindFiles
ClosedPublic

Authored by jingham on Jan 31 2019, 3:55 PM.

Details

Reviewers
clayborg
labath
zturner
serge-sans-paille
Commits
rG052f7ff96a85: Fix PathMappingList::FindFile to handle relative incoming FileSpecs.
rLLDB353243: Fix PathMappingList::FindFile to handle relative incoming FileSpecs.
rL353243: Fix PathMappingList::FindFile to handle relative incoming FileSpecs.
Summary

When lldb switched to normalizing paths in FileSpec's, the source-map code failed to handle the case where the initial path was relative (usually "."). Greg fixed the PathMapListing::RemapPath code in r327600 and added a test for breakpoint setting with remapped paths. But he didn't do the similar fix to PathMapListing::FindFiles. That meant that though we could set breakpoints in files specified this way, we would fail to find and display the actual source contents from the remapped location.

This patch adds the handling of "." in the source slot for that function, and adds a test for it. I also changed the input file so that it came from a build where the source file was in a subdirectory of the comp dir. Sometimes we were succeeding by accident in the simpler setup.

I also fixed a bug in the test case where we were calling getBuildArtifact with a complete path to the test directory, which just returned a path in the test directory. Fixing that meant the output file was now correctly going in the build directory and we didn't have to delete the file anymore - we no longer delete test files from the build directory.

Diff Detail

Repository
rL LLVM

Event Timeline

jingham created this revision.Jan 31 2019, 3:55 PM
Herald added a reviewer: serge-sans-paille. · View Herald TranscriptJan 31 2019, 3:55 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: teemperor, abidh. · View Herald Transcript
labath added inline comments.Feb 1 2019, 4:44 AM
packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py
32–34 ↗(On Diff #184640)

Is this intentional?

source/Target/PathMappingList.cpp
207 ↗(On Diff #184640)

!orig_path.empty()?

232 ↗(On Diff #184640)

The size() is actually unneeded as consume_front is trivially true for an empty StringRef.

Herald added a subscriber: lldb-commits. · View Herald TranscriptFeb 1 2019, 4:44 AM
ted added a subscriber: ted.EditedFeb 1 2019, 7:40 AM

FYI, @jingham , this is also an issue with DYLD plugins, if the file in the link map starts with ".". "image search-paths add . /path/to/my/libraries" fails in this case, because "./library.so" gets changed to "library.so".

jingham updated this revision to Diff 184784.Feb 1 2019, 10:10 AM

Fixed some inadvertently commented out test code (test still passes...)
Applied Pavel's suggestions (thanks!)

jingham marked 5 inline comments as done.Feb 1 2019, 10:12 AM
jingham added inline comments.
packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py
32–34 ↗(On Diff #184640)

No. The test still passes with these uncommented!

source/Target/PathMappingList.cpp
207 ↗(On Diff #184640)

Doh!

jingham marked 2 inline comments as done.Feb 1 2019, 10:16 AM
In D57552#1380782, @ted wrote:

FYI, @jingham , this is also an issue with DYLD plugins, if the file in the link map starts with ".". "image search-paths add . /path/to/my/libraries" fails in this case, because "./library.so" gets changed to "library.so".

This should fix that issue as well, since image search-paths are also PathMappingLists. I don't see any tests for this, however. Do you have something handy you could turn into a test?

zturner added inline comments.Feb 1 2019, 10:25 AM
source/Target/PathMappingList.cpp
204 ↗(On Diff #184784)

Can we put some early returns in here?

new_spec.Clear();

if (m_pairs.empty())
  return;
207 ↗(On Diff #184784)
if (orig_path.empty())
  return;
208 ↗(On Diff #184784)

I think we can move this declaration inside of the for loop

212 ↗(On Diff #184784)

How about

for (const auto &pair : m_pairs) {
}
232 ↗(On Diff #184784)

After moving inside of the for loop, you can just write if (orig_ref.consume_front(prefix_ref))

ted added a comment.Feb 1 2019, 10:39 AM
In D57552#1381046, @jingham wrote:
In D57552#1380782, @ted wrote:

FYI, @jingham , this is also an issue with DYLD plugins, if the file in the link map starts with ".". "image search-paths add . /path/to/my/libraries" fails in this case, because "./library.so" gets changed to "library.so".

This should fix that issue as well, since image search-paths are also PathMappingLists. I don't see any tests for this, however. Do you have something handy you could turn into a test?

I don't think this will fix it, because the problem happens in the initial FileSpec, before we get to search-paths.

From source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp, DYLDRendezvous::ReadSOEntryFromMemory():

std::string file_path = ReadStringFromMemory(entry.path_addr);
entry.file_spec.SetFile(file_path, false, FileSpec::Style::native);

FileSpec::SetFile normalizes the path, which will remove a leading "./", so "image search-paths add . /path/to/my/lib", which would work with "./mylib.so", won't work with "mylib.so".

I think I can write a test that uses LD_LIBRARY_PATH and a subdirectory so the target can load "./mylib.so", but LLDB won't be able to see it without a search-path.

jingham updated this revision to Diff 184790.Feb 1 2019, 10:43 AM

Implemented Zachary's suggestions.
Also added the source file sub-directory so the test will pass on other people's machines...

jingham marked 5 inline comments as done.Feb 1 2019, 10:44 AM

Sure, that's clearer.

jingham added a comment.Feb 1 2019, 10:50 AM
In D57552#1381094, @ted wrote:
In D57552#1381046, @jingham wrote:
In D57552#1380782, @ted wrote:

FYI, @jingham , this is also an issue with DYLD plugins, if the file in the link map starts with ".". "image search-paths add . /path/to/my/libraries" fails in this case, because "./library.so" gets changed to "library.so".

This should fix that issue as well, since image search-paths are also PathMappingLists. I don't see any tests for this, however. Do you have something handy you could turn into a test?

I don't think this will fix it, because the problem happens in the initial FileSpec, before we get to search-paths.

From source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp, DYLDRendezvous::ReadSOEntryFromMemory():

std::string file_path = ReadStringFromMemory(entry.path_addr);
entry.file_spec.SetFile(file_path, false, FileSpec::Style::native);

FileSpec::SetFile normalizes the path, which will remove a leading "./", so "image search-paths add . /path/to/my/lib", which would work with "./mylib.so", won't work with "mylib.so".

I think I can write a test that uses LD_LIBRARY_PATH and a subdirectory so the target can load "./mylib.so", but LLDB won't be able to see it without a search-path.

That sounds like it will have to be fixed somewhere else, and not part of this patch then. Can you file a bug to get that fixed?

ted added a comment.Feb 1 2019, 11:36 AM
In D57552#1381126, @jingham wrote:

That sounds like it will have to be fixed somewhere else, and not part of this patch then. Can you file a bug to get that fixed?

Yeah, it's on my todo list. Which keeps growing!

clayborg added inline comments.Feb 1 2019, 1:52 PM
source/Target/PathMappingList.cpp
223 ↗(On Diff #184790)

We are we finding a "." in any path now? I thought we normalized those all out? Can a PathMappingList contain non normalized paths? if so, can't we just normalize them as they go into the list?

jingham marked an inline comment as done.Feb 4 2019, 10:15 AM
jingham added inline comments.
source/Target/PathMappingList.cpp
223 ↗(On Diff #184790)

That's the incoming path from the path maps. You can't normalize just a "." from the path mappings or it would become "" and we don't really know what that means. These are currently left as ".". I think that's right.

labath accepted this revision.Feb 5 2019, 1:56 AM

If Greg is happy, then LGTM from me too.

source/Target/PathMappingList.cpp
223 ↗(On Diff #184790)

FileSpec::IsValid() considers "" to be an invalid path. Most utilities/APIs do the same. The llvm api are a bit conflicted here though as sometimes they do consider "" to be invalid, but otoh they will happilly normalize "." to "".

Bottom line: I also think that the current FileSpec behavior is correct.

This revision is now accepted and ready to land.Feb 5 2019, 1:56 AM
clayborg accepted this revision.Feb 5 2019, 1:04 PM

Thanks for the answers. LGTM

Closed by commit rL353243: Fix PathMappingList::FindFile to handle relative incoming FileSpecs. (authored by jingham). · Explain WhyFeb 5 2019, 3:48 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 5 2019, 3:48 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
stella.stamenova added a subscriber: stella.stamenova.Feb 5 2019, 4:30 PM

This is failing on the windows bot:

http://lab.llvm.org:8011/builders/lldb-x64-windows-ninja/builds/1379

Revision Contents

PathSize
lldb/
trunk/
packages/
Python/
lldbsuite/
test/
functionalities/
source-map/
20 lines
456 lines
source/
Target/
54 lines

Diff 185427

lldb/trunk/packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py

Show All 9 Linesclass TestTargetSourceMap(TestBase):
@no_debug_info_test @no_debug_info_test
def test_source_map(self): def test_source_map(self):
"""Test target.source-map' functionality.""" """Test target.source-map' functionality."""
# Set the target soure map to map "./" to the current test directory # Set the target soure map to map "./" to the current test directory
src_dir = self.getSourceDir() src_dir = self.getSourceDir()
src_path = os.path.join(src_dir, "main.c") src_path = os.path.join(src_dir, "main.c")
yaml_path = os.path.join(src_dir, "a.yaml") yaml_path = os.path.join(src_dir, "a.yaml")
yaml_base, ext = os.path.splitext(yaml_path) yaml_base, ext = os.path.splitext(yaml_path)
obj_path = self.getBuildArtifact(yaml_base) obj_path = self.getBuildArtifact("main.o")
self.yaml2obj(yaml_path, obj_path) self.yaml2obj(yaml_path, obj_path)
def cleanup():
if os.path.exists(obj_path):
os.unlink(obj_path)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
# Create a target with the object file we just created from YAML # Create a target with the object file we just created from YAML
target = self.dbg.CreateTarget(obj_path) target = self.dbg.CreateTarget(obj_path)
# Set a breakpoint before we remap source and verify that it fails # Set a breakpoint before we remap source and verify that it fails
bp = target.BreakpointCreateByLocation(src_path, 2) bp = target.BreakpointCreateByLocation(src_path, 2)
self.assertTrue(bp.GetNumLocations() == 0, self.assertTrue(bp.GetNumLocations() == 0,
"make sure no breakpoints were resolved without map") "make sure no breakpoints were resolved without map")
src_map_cmd = 'settings set target.source-map ./ "%s"' % (src_dir) src_map_cmd = 'settings set target.source-map . "%s"' % (src_dir)
self.dbg.HandleCommand(src_map_cmd) self.dbg.HandleCommand(src_map_cmd)
# Set a breakpoint after we remap source and verify that it succeeds # Set a breakpoint after we remap source and verify that it succeeds
bp = target.BreakpointCreateByLocation(src_path, 2) bp = target.BreakpointCreateByLocation(src_path, 2)
self.assertTrue(bp.GetNumLocations() == 1, self.assertTrue(bp.GetNumLocations() == 1,
"make sure breakpoint was resolved with map") "make sure breakpoint was resolved with map")
# Now make sure that we can actually FIND the source file using this
# remapping:
retval = lldb.SBCommandReturnObject()
self.dbg.GetCommandInterpreter().HandleCommand("source list -f main.c -l 2", retval)
self.assertTrue(retval.Succeeded(), "source list didn't succeed.")
self.assertTrue(retval.GetOutput() != None, "We got no ouput from source list")
self.assertTrue("return" in retval.GetOutput(), "We didn't find the source file...")

lldb/trunk/packages/Python/lldbsuite/test/functionalities/source-map/a.yaml

--- !mach-o --- !mach-o
FileHeader: FileHeader:
magic: 0xFEEDFACF magic: 0xFEEDFACF
cputype: 0x01000007 cputype: 0x01000007
cpusubtype: 0x00000003 cpusubtype: 0x00000003
filetype: 0x0000000A filetype: 0x00000001
ncmds: 6 ncmds: 4
sizeofcmds: 1376 sizeofcmds: 1160
flags: 0x00000000 flags: 0x00002000
reserved: 0x00000000 reserved: 0x00000000
LoadCommands: LoadCommands:
- cmd: LC_UUID
cmdsize: 24
uuid: D37CC773-C218-3F97-99C9-CE4E77DDF2CE
- cmd: LC_SYMTAB
cmdsize: 24
symoff: 4096
nsyms: 2
stroff: 4128
strsize: 28
- cmd: LC_SEGMENT_64 - cmd: LC_SEGMENT_64
cmdsize: 72 cmdsize: 1032
segname: __PAGEZERO segname: ''
vmaddr: 0 vmaddr: 0
vmsize: 4294967296 vmsize: 744
fileoff: 0 fileoff: 1192
filesize: 0 filesize: 744
maxprot: 0
initprot: 0
nsects: 0
flags: 0
- cmd: LC_SEGMENT_64
cmdsize: 232
segname: __TEXT
vmaddr: 4294967296
vmsize: 4096
fileoff: 0
filesize: 0
maxprot: 7 maxprot: 7
initprot: 5 initprot: 7
nsects: 2 nsects: 12
flags: 0 flags: 0
Sections: Sections:
- sectname: __text - sectname: __text
segname: __TEXT segname: __TEXT
addr: 0x0000000100000FA0 addr: 0x0000000000000000
size: 15 size: 22
offset: 0x00000000 offset: 0x000004A8
align: 4 align: 4
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x80000400 flags: 0x80000400
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __unwind_info - sectname: __debug_str
segname: __TEXT
addr: 0x0000000100000FB0
size: 72
offset: 0x00000000
align: 2
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- cmd: LC_SEGMENT_64
cmdsize: 72
segname: __LINKEDIT
vmaddr: 4294971392
vmsize: 4096
fileoff: 4096
filesize: 60
maxprot: 7
initprot: 1
nsects: 0
flags: 0
- cmd: LC_SEGMENT_64
cmdsize: 952
segname: __DWARF
vmaddr: 4294975488
vmsize: 4096
fileoff: 8192
filesize: 563
maxprot: 7
initprot: 3
nsects: 11
flags: 0
Sections:
- sectname: __debug_line
segname: __DWARF segname: __DWARF
addr: 0x0000000100002000 addr: 0x0000000000000016
size: 60 size: 108
offset: 0x00002000 offset: 0x000004BE
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __debug_pubnames - sectname: __debug_abbrev
segname: __DWARF segname: __DWARF
addr: 0x000000010000203C addr: 0x0000000000000082
size: 27 size: 83
offset: 0x0000203C offset: 0x0000052A
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __debug_pubtypes - sectname: __debug_info
segname: __DWARF segname: __DWARF
addr: 0x0000000100002057 addr: 0x00000000000000D5
size: 26 size: 126
offset: 0x00002057 offset: 0x0000057D
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000790
nreloc: 0 nreloc: 2
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __debug_aranges - sectname: __debug_macinfo
segname: __DWARF segname: __DWARF
addr: 0x0000000100002071 addr: 0x0000000000000153
size: 48 size: 1
offset: 0x00002071 offset: 0x000005FB
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __debug_info - sectname: __apple_names
segname: __DWARF segname: __DWARF
addr: 0x00000001000020A1 addr: 0x0000000000000154
size: 75 size: 60
offset: 0x000020A1 offset: 0x000005FC
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __debug_abbrev - sectname: __apple_objc
segname: __DWARF segname: __DWARF
addr: 0x00000001000020EC addr: 0x0000000000000190
size: 52 size: 36
offset: 0x000020EC offset: 0x00000638
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __debug_str - sectname: __apple_namespac
segname: __DWARF segname: __DWARF
addr: 0x0000000100002120 addr: 0x00000000000001B4
size: 28 size: 36
offset: 0x00002120 offset: 0x0000065C
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __apple_names - sectname: __apple_types
segname: __DWARF segname: __DWARF
addr: 0x0000000100002160 addr: 0x00000000000001D8
size: 60 size: 102
offset: 0x00002160 offset: 0x00000680
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __apple_namespac - sectname: __compact_unwind
segname: __DWARF segname: __LD
addr: 0x000000010000219C addr: 0x0000000000000240
size: 36 size: 32
offset: 0x0000219C offset: 0x000006E8
align: 0 align: 3
reloff: 0x00000000 reloff: 0x000007A0
nreloc: 0 nreloc: 1
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __apple_types - sectname: __eh_frame
segname: __DWARF segname: __TEXT
addr: 0x00000001000021C0 addr: 0x0000000000000260
size: 79 size: 64
offset: 0x000021C0 offset: 0x00000708
align: 0 align: 3
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000000 flags: 0x6800000B
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- sectname: __apple_objc - sectname: __debug_line
segname: __DWARF segname: __DWARF
addr: 0x000000010000220F addr: 0x00000000000002A0
size: 36 size: 72
offset: 0x0000220F offset: 0x00000748
align: 0 align: 0
reloff: 0x00000000 reloff: 0x000007A8
nreloc: 0 nreloc: 1
flags: 0x00000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
- cmd: LC_BUILD_VERSION
cmdsize: 24
platform: 1
minos: 658944
sdk: 658944
ntools: 0
- cmd: LC_SYMTAB
cmdsize: 24
symoff: 1968
nsyms: 1
stroff: 1984
strsize: 8
- cmd: LC_DYSYMTAB
cmdsize: 80
ilocalsym: 0
nlocalsym: 0
iextdefsym: 0
nextdefsym: 1
iundefsym: 1
nundefsym: 0
tocoff: 0
ntoc: 0
modtaboff: 0
nmodtab: 0
extrefsymoff: 0
nextrefsyms: 0
indirectsymoff: 0
nindirectsyms: 0
extreloff: 0
nextrel: 0
locreloff: 0
nlocrel: 0
LinkEditData: LinkEditData:
NameList: NameList:
- n_strx: 2 - n_strx: 1
n_type: 0x0F
n_sect: 1
n_desc: 16
n_value: 4294967296
- n_strx: 22
n_type: 0x0F n_type: 0x0F
n_sect: 1 n_sect: 1
n_desc: 0 n_desc: 0
n_value: 4294971296 n_value: 0
StringTable: StringTable:
- '' - ''
- ''
- __mh_execute_header
- _main - _main
- ''
DWARF: DWARF:
debug_str: debug_str:
- '' - 'Apple LLVM version 10.0.1 (clang-1001.0.37.3)'
- obj2yaml - './Trivial/main.c'
- main.c - '.'
- .
- main - main
- int - int
- argc
- argv
- char
debug_abbrev: debug_abbrev:
- Code: 0x00000001 - Code: 0x00000001
Tag: DW_TAG_compile_unit Tag: DW_TAG_compile_unit
Children: DW_CHILDREN_yes Children: DW_CHILDREN_yes
Attributes: Attributes:
- Attribute: DW_AT_producer - Attribute: DW_AT_producer
Form: DW_FORM_strp Form: DW_FORM_strp
- Attribute: DW_AT_language - Attribute: DW_AT_language
Form: DW_FORM_data2 Form: DW_FORM_data2
- Attribute: DW_AT_name - Attribute: DW_AT_name
Form: DW_FORM_strp Form: DW_FORM_strp
- Attribute: DW_AT_stmt_list - Attribute: DW_AT_stmt_list
Form: DW_FORM_sec_offset Form: DW_FORM_sec_offset
- Attribute: DW_AT_comp_dir - Attribute: DW_AT_comp_dir
Form: DW_FORM_strp Form: DW_FORM_strp
- Attribute: DW_AT_low_pc - Attribute: DW_AT_low_pc
Form: DW_FORM_addr Form: DW_FORM_addr
- Attribute: DW_AT_high_pc - Attribute: DW_AT_high_pc
Form: DW_FORM_data4 Form: DW_FORM_data4
- Code: 0x00000002 - Code: 0x00000002
Tag: DW_TAG_subprogram Tag: DW_TAG_subprogram
Children: DW_CHILDREN_no Children: DW_CHILDREN_yes
Attributes: Attributes:
- Attribute: DW_AT_low_pc - Attribute: DW_AT_low_pc
Form: DW_FORM_addr Form: DW_FORM_addr
- Attribute: DW_AT_high_pc - Attribute: DW_AT_high_pc
Form: DW_FORM_data4 Form: DW_FORM_data4
- Attribute: DW_AT_frame_base - Attribute: DW_AT_frame_base
Form: DW_FORM_exprloc Form: DW_FORM_exprloc
- Attribute: DW_AT_name - Attribute: DW_AT_name
Form: DW_FORM_strp Form: DW_FORM_strp
- Attribute: DW_AT_decl_file - Attribute: DW_AT_decl_file
Form: DW_FORM_data1 Form: DW_FORM_data1
- Attribute: DW_AT_decl_line - Attribute: DW_AT_decl_line
Form: DW_FORM_data1 Form: DW_FORM_data1
- Attribute: DW_AT_prototyped
Form: DW_FORM_flag_present
- Attribute: DW_AT_type - Attribute: DW_AT_type
Form: DW_FORM_ref4 Form: DW_FORM_ref4
- Attribute: DW_AT_external - Attribute: DW_AT_external
Form: DW_FORM_flag_present Form: DW_FORM_flag_present
- Code: 0x00000003 - Code: 0x00000003
Tag: DW_TAG_formal_parameter
Children: DW_CHILDREN_no
Attributes:
- Attribute: DW_AT_location
Form: DW_FORM_exprloc
- Attribute: DW_AT_name
Form: DW_FORM_strp
- Attribute: DW_AT_decl_file
Form: DW_FORM_data1
- Attribute: DW_AT_decl_line
Form: DW_FORM_data1
- Attribute: DW_AT_type
Form: DW_FORM_ref4
- Code: 0x00000004
Tag: DW_TAG_base_type Tag: DW_TAG_base_type
Children: DW_CHILDREN_no Children: DW_CHILDREN_no
Attributes: Attributes:
- Attribute: DW_AT_name - Attribute: DW_AT_name
Form: DW_FORM_strp Form: DW_FORM_strp
- Attribute: DW_AT_encoding - Attribute: DW_AT_encoding
Form: DW_FORM_data1 Form: DW_FORM_data1
- Attribute: DW_AT_byte_size - Attribute: DW_AT_byte_size
Form: DW_FORM_data1 Form: DW_FORM_data1
debug_aranges: - Code: 0x00000005
- Length: Tag: DW_TAG_pointer_type
TotalLength: 44 Children: DW_CHILDREN_no
Version: 2 Attributes:
CuOffset: 0 - Attribute: DW_AT_type
AddrSize: 8 Form: DW_FORM_ref4
SegSize: 0 - Code: 0x00000006
Descriptors: Tag: DW_TAG_const_type
- Address: 0x0000000100000FA0 Children: DW_CHILDREN_no
Length: 15 Attributes:
debug_pubnames: - Attribute: DW_AT_type
Length: Form: DW_FORM_ref4
TotalLength: 23
Version: 2
UnitOffset: 0
UnitSize: 75
Entries:
- DieOffset: 0x0000002A
Name: main
debug_pubtypes:
Length:
TotalLength: 22
Version: 2
UnitOffset: 0
UnitSize: 75
Entries:
- DieOffset: 0x00000043
Name: int
debug_info: debug_info:
- Length: - Length:
TotalLength: 71 TotalLength: 122
Version: 4 Version: 4
AbbrOffset: 0 AbbrOffset: 0
AddrSize: 8 AddrSize: 8
Entries: Entries:
- AbbrCode: 0x00000001 - AbbrCode: 0x00000001
Values: Values:
- Value: 0x0000000000000001 - Value: 0x0000000000000000
- Value: 0x000000000000000C - Value: 0x000000000000000C
- Value: 0x000000000000000A - Value: 0x000000000000002E
- Value: 0x0000000000000000
- Value: 0x000000000000003F
- Value: 0x0000000000000000 - Value: 0x0000000000000000
- Value: 0x0000000000000011 - Value: 0x0000000000000016
- Value: 0x0000000100000FA0
- Value: 0x000000000000000F
- AbbrCode: 0x00000002 - AbbrCode: 0x00000002
Values: Values:
- Value: 0x0000000100000FA0 - Value: 0x0000000000000000
- Value: 0x000000000000000F - Value: 0x0000000000000016
- Value: 0x0000000000000001 - Value: 0x0000000000000001
BlockData: BlockData:
- 0x56 - 0x56
- Value: 0x0000000000000013 - Value: 0x0000000000000054
- Value: 0x0000000000000001 - Value: 0x0000000000000001
- Value: 0x0000000000000001 - Value: 0x0000000000000001
- Value: 0x0000000000000043 - Value: 0x0000000000000001
- Value: 0x0000000000000060
- Value: 0x0000000000000001 - Value: 0x0000000000000001
- AbbrCode: 0x00000003 - AbbrCode: 0x00000003
Values: Values:
- Value: 0x0000000000000018 - Value: 0x0000000000000002
BlockData:
- 0x91
- 0x78
- Value: 0x000000000000005D
- Value: 0x0000000000000001
- Value: 0x0000000000000001
- Value: 0x0000000000000060
- AbbrCode: 0x00000003
Values:
- Value: 0x0000000000000002
BlockData:
- 0x91
- 0x70
- Value: 0x0000000000000062
- Value: 0x0000000000000001
- Value: 0x0000000000000001
- Value: 0x0000000000000067
- AbbrCode: 0x00000000
Values: []
- AbbrCode: 0x00000004
Values:
- Value: 0x0000000000000059
- Value: 0x0000000000000005 - Value: 0x0000000000000005
- Value: 0x0000000000000004 - Value: 0x0000000000000004
- AbbrCode: 0x00000000 - AbbrCode: 0x00000005
Values:
- Value: 0x000000000000006C
- AbbrCode: 0x00000005
Values:
- Value: 0x0000000000000071
- AbbrCode: 0x00000006
Values: Values:
- Value: 0x0000000000000076
- AbbrCode: 0x00000004
Values:
- Value: 0x0000000000000067
- Value: 0x0000000000000006
- Value: 0x0000000000000001
- AbbrCode: 0x00000000
Values: []
debug_line: debug_line:
- Length: - Length:
TotalLength: 56 TotalLength: 68
Version: 2 Version: 4
PrologueLength: 29 PrologueLength: 40
MinInstLength: 1 MinInstLength: 1
MaxOpsPerInst: 1
DefaultIsStmt: 1 DefaultIsStmt: 1
LineBase: 251 LineBase: 251
LineRange: 14 LineRange: 14
OpcodeBase: 13 OpcodeBase: 13
StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ] StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
IncludeDirs: IncludeDirs:
- './Trivial'
Files: Files:
- Name: main.c - Name: main.c
DirIdx: 0 DirIdx: 1
ModTime: 0 ModTime: 0
Length: 0 Length: 0
Opcodes: Opcodes:
- Opcode: DW_LNS_extended_op - Opcode: DW_LNS_extended_op
ExtLen: 9 ExtLen: 9
SubOpcode: DW_LNE_set_address SubOpcode: DW_LNE_set_address
Data: 4294971296 Data: 0
- Opcode: DW_LNS_copy - Opcode: DW_LNS_copy
Data: 4294971296 Data: 0
- Opcode: DW_LNS_set_column - Opcode: DW_LNS_set_column
Data: 2 Data: 3
- Opcode: DW_LNS_set_prologue_end - Opcode: DW_LNS_set_prologue_end
Data: 2 Data: 3
- Opcode: 0xC9 - Opcode: DW_LNS_const_add_pc
Data: 2 Data: 3
- Opcode: 0x3D
Data: 3
- Opcode: DW_LNS_advance_pc - Opcode: DW_LNS_advance_pc
Data: 2 Data: 2
- Opcode: DW_LNS_extended_op - Opcode: DW_LNS_extended_op
ExtLen: 1 ExtLen: 1
SubOpcode: DW_LNE_end_sequence SubOpcode: DW_LNE_end_sequence
Data: 2 Data: 2
... ...

lldb/trunk/source/Target/PathMappingList.cpp

Show First 20 Lines • Show All 195 Lines • ▼ Show 20 Lines for (const auto &it : m_pairs) {
fixed.AppendPathComponent(path_ref); fixed.AppendPathComponent(path_ref);
return true; return true;
} }
return false; return false;
} }
bool PathMappingList::FindFile(const FileSpec &orig_spec, bool PathMappingList::FindFile(const FileSpec &orig_spec,
FileSpec &new_spec) const { FileSpec &new_spec) const {
if (!m_pairs.empty()) { if (m_pairs.empty())
char orig_path[PATH_MAX]; return false;
const size_t orig_path_len =
orig_spec.GetPath(orig_path, sizeof(orig_path)); std::string orig_path = orig_spec.GetPath();
if (orig_path_len > 0) {
if (orig_path.empty())
return false;
bool orig_is_relative = orig_spec.IsRelative();
const_iterator pos, end = m_pairs.end(); const_iterator pos, end = m_pairs.end();
for (pos = m_pairs.begin(); pos != end; ++pos) { for (pos = m_pairs.begin(); pos != end; ++pos) {
const size_t prefix_len = pos->first.GetLength(); llvm::StringRef orig_ref(orig_path);
llvm::StringRef prefix_ref = pos->first.GetStringRef();
if (orig_ref.size() >= prefix_ref.size()) {
// We consider a relative prefix or one of just "." to
// mean "only apply to relative paths".
bool prefix_is_relative = false;
if (prefix_ref == ".") {
prefix_is_relative = true;
// Remove the "." since it will have been removed from the
// FileSpec paths already.
prefix_ref = prefix_ref.drop_front();
} else {
FileSpec prefix_spec(prefix_ref, FileSpec::Style::native);
prefix_is_relative = prefix_spec.IsRelative();
}
if (prefix_is_relative != orig_is_relative)
continue;
if (orig_path_len >= prefix_len) { if (orig_ref.consume_front(prefix_ref)) {
if (::strncmp(pos->first.GetCString(), orig_path, prefix_len) == 0) {
new_spec.SetFile(pos->second.GetCString(), FileSpec::Style::native); new_spec.SetFile(pos->second.GetCString(), FileSpec::Style::native);
new_spec.AppendPathComponent(orig_path + prefix_len); new_spec.AppendPathComponent(orig_ref);
if (FileSystem::Instance().Exists(new_spec)) if (FileSystem::Instance().Exists(new_spec))
return true; return true;
} }
} }
} }
}
}
new_spec.Clear(); new_spec.Clear();
return false; return false;
} }
bool PathMappingList::Replace(const ConstString &path, bool PathMappingList::Replace(const ConstString &path,
const ConstString &new_path, bool notify) { const ConstString &new_path, bool notify) {
uint32_t idx = FindIndexForPath(path); uint32_t idx = FindIndexForPath(path);
if (idx < m_pairs.size()) { if (idx < m_pairs.size()) {
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines