This is an archive of the discontinued LLVM Phabricator instance.

Differential D95008

Revert "Revert "Ignores functions that have a range starting outside of a code section""
Needs ReviewPublic

Authored by aadsm on Jan 19 2021, 3:45 PM.

Details

Reviewers
stella.stamenova
shafik
jdoerfert
Summary

This reverts commit a9dcd15f50dc27ca3ed4aa98b8832923db7dfb61.

Diff Detail

Event Timeline

aadsm created this revision.Jan 19 2021, 3:45 PM
Herald added a reviewer: shafik. · View Herald TranscriptJan 19 2021, 3:45 PM
aadsm requested review of this revision.Jan 19 2021, 3:45 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJan 19 2021, 3:45 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: lldb-commits, sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B85788: Diff 317716.Jan 19 2021, 4:52 PM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptJan 19 2021, 4:52 PM
stella.stamenova added inline comments.Jan 26 2021, 9:44 AM
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
775

This line does not build on Windows. Does it build for you?!

Revision Contents

PathSize
lldb/
source/
Plugins/
SymbolFile/
DWARF/
3 lines
3 lines
10 lines
3 lines
test/
Shell/
SymbolFile/
DWARF/
367 lines

Diff 317716

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.h

//===-- DWARFASTParser.h ----------------------------------------*- C++ -*-===// //===-- DWARFASTParser.h ----------------------------------------*- C++ -*-===//
Lint: Lint
Inline Actions

clang-format not found in user's PATH; not linting file.

Lint: Lint: clang-format not found in user's PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
Show All 18 Linespublic:
virtual ~DWARFASTParser() {} virtual ~DWARFASTParser() {}
virtual lldb::TypeSP ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, virtual lldb::TypeSP ParseTypeFromDWARF(const lldb_private::SymbolContext &sc,
const DWARFDIE &die, const DWARFDIE &die,
bool *type_is_new_ptr) = 0; bool *type_is_new_ptr) = 0;
virtual lldb_private::Function * virtual lldb_private::Function *
ParseFunctionFromDWARF(lldb_private::CompileUnit &comp_unit, ParseFunctionFromDWARF(lldb_private::CompileUnit &comp_unit,
const DWARFDIE &die) = 0; const DWARFDIE &die,
lldb::addr_t first_code_address) = 0;
virtual bool virtual bool
CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type *type, CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type *type,
lldb_private::CompilerType &compiler_type) = 0; lldb_private::CompilerType &compiler_type) = 0;
virtual lldb_private::CompilerDecl virtual lldb_private::CompilerDecl
GetDeclForUIDFromDWARF(const DWARFDIE &die) = 0; GetDeclForUIDFromDWARF(const DWARFDIE &die) = 0;
Show All 15 Lines

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h

//===-- DWARFASTParserClang.h -----------------------------------*- C++ -*-===// //===-- DWARFASTParserClang.h -----------------------------------*- C++ -*-===//
Lint: Lint
Inline Actions

clang-format not found in user's PATH; not linting file.

Lint: Lint: clang-format not found in user's PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_DWARFASTPARSERCLANG_H #ifndef LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_DWARFASTPARSERCLANG_H
#define LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_DWARFASTPARSERCLANG_H #define LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_DWARFASTPARSERCLANG_H
#include "clang/AST/CharUnits.h" #include "clang/AST/CharUnits.h"
Lint: Pre-merge checks
Inline Actions

clang-tidy: error: 'clang/AST/CharUnits.h' file not found [clang-diagnostic-error]
not useful
clang-tidy: error: 'clang/AST/CharUnits.h' file not found [clang-diagnostic-error]
not useful

Lint: Pre-merge checks: clang-tidy: error: 'clang/AST/CharUnits.h' file not found [clang-diagnostic-error] [[https…
#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include "DWARFASTParser.h" #include "DWARFASTParser.h"
#include "DWARFDIE.h" #include "DWARFDIE.h"
#include "DWARFDefines.h" #include "DWARFDefines.h"
#include "DWARFFormValue.h" #include "DWARFFormValue.h"
Show All 21 Linespublic:
// DWARFASTParser interface. // DWARFASTParser interface.
lldb::TypeSP ParseTypeFromDWARF(const lldb_private::SymbolContext &sc, lldb::TypeSP ParseTypeFromDWARF(const lldb_private::SymbolContext &sc,
const DWARFDIE &die, const DWARFDIE &die,
bool *type_is_new_ptr) override; bool *type_is_new_ptr) override;
lldb_private::Function * lldb_private::Function *
ParseFunctionFromDWARF(lldb_private::CompileUnit &comp_unit, ParseFunctionFromDWARF(lldb_private::CompileUnit &comp_unit,
const DWARFDIE &die) override; const DWARFDIE &die,
lldb::addr_t first_code_address) override;
bool bool
CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type *type, CompleteTypeFromDWARF(const DWARFDIE &die, lldb_private::Type *type,
lldb_private::CompilerType &compiler_type) override; lldb_private::CompilerType &compiler_type) override;
lldb_private::CompilerDecl lldb_private::CompilerDecl
GetDeclForUIDFromDWARF(const DWARFDIE &die) override; GetDeclForUIDFromDWARF(const DWARFDIE &die) override;
▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

//===-- DWARFASTParserClang.cpp -------------------------------------------===// //===-- DWARFASTParserClang.cpp -------------------------------------------===//
Lint: Lint
Inline Actions

clang-format not found in user's PATH; not linting file.

Lint: Lint: clang-format not found in user's PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
▲ Show 20 Lines • Show All 2,212 Lines • ▼ Show 20 Lines if (tag == DW_TAG_enumerator) {
++enumerators_added; ++enumerators_added;
} }
} }
} }
} }
return enumerators_added; return enumerators_added;
} }
Function *DWARFASTParserClang::ParseFunctionFromDWARF(CompileUnit &comp_unit, Function *
const DWARFDIE &die) { DWARFASTParserClang::ParseFunctionFromDWARF(CompileUnit &comp_unit,
const DWARFDIE &die,
lldb::addr_t first_code_address) {
DWARFRangeList func_ranges; DWARFRangeList func_ranges;
const char *name = nullptr; const char *name = nullptr;
const char *mangled = nullptr; const char *mangled = nullptr;
int decl_file = 0; int decl_file = 0;
int decl_line = 0; int decl_line = 0;
int decl_column = 0; int decl_column = 0;
int call_file = 0; int call_file = 0;
int call_line = 0; int call_line = 0;
Show All 18 Lines if (lowest_func_addr != LLDB_INVALID_ADDRESS &&
lowest_func_addr <= highest_func_addr) { lowest_func_addr <= highest_func_addr) {
ModuleSP module_sp(die.GetModule()); ModuleSP module_sp(die.GetModule());
func_range.GetBaseAddress().ResolveAddressUsingFileSections( func_range.GetBaseAddress().ResolveAddressUsingFileSections(
lowest_func_addr, module_sp->GetSectionList()); lowest_func_addr, module_sp->GetSectionList());
if (func_range.GetBaseAddress().IsValid()) if (func_range.GetBaseAddress().IsValid())
func_range.SetByteSize(highest_func_addr - lowest_func_addr); func_range.SetByteSize(highest_func_addr - lowest_func_addr);
} }
if (func_range.GetBaseAddress().IsValid()) { if (lowest_func_addr >= first_code_address &&
lowest_func_addr != LLDB_INVALID_ADDRESS &&
lowest_func_addr <= highest_func_addr) {
Mangled func_name; Mangled func_name;
if (mangled) if (mangled)
func_name.SetValue(ConstString(mangled), true); func_name.SetValue(ConstString(mangled), true);
else if ((die.GetParent().Tag() == DW_TAG_compile_unit || else if ((die.GetParent().Tag() == DW_TAG_compile_unit ||
die.GetParent().Tag() == DW_TAG_partial_unit) && die.GetParent().Tag() == DW_TAG_partial_unit) &&
Language::LanguageIsCPlusPlus( Language::LanguageIsCPlusPlus(
SymbolFileDWARF::GetLanguage(*die.GetCU())) && SymbolFileDWARF::GetLanguage(*die.GetCU())) &&
!Language::LanguageIsObjC( !Language::LanguageIsObjC(
▲ Show 20 Lines • Show All 1,498 Lines • Show Last 20 Lines

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

//===-- SymbolFileDWARF.cpp -----------------------------------------------===// //===-- SymbolFileDWARF.cpp -----------------------------------------------===//
Lint: Lint
Inline Actions

clang-format not found in user's PATH; not linting file.

Lint: Lint: clang-format not found in user's PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
▲ Show 20 Lines • Show All 757 Lines • ▼ Show 20 Lines if (auto err = type_system_or_err.takeError()) {
LLDB_LOG_ERROR(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_SYMBOLS), LLDB_LOG_ERROR(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_SYMBOLS),
std::move(err), "Unable to parse function"); std::move(err), "Unable to parse function");
return nullptr; return nullptr;
} }
DWARFASTParser *dwarf_ast = type_system_or_err->GetDWARFParser(); DWARFASTParser *dwarf_ast = type_system_or_err->GetDWARFParser();
if (!dwarf_ast) if (!dwarf_ast)
return nullptr; return nullptr;
return dwarf_ast->ParseFunctionFromDWARF(comp_unit, die); return dwarf_ast->ParseFunctionFromDWARF(comp_unit, die,
m_first_code_address);
stella.stamenovaUnsubmitted
Not Done
ReplyInline Actions

This line does not build on Windows. Does it build for you?!

stella.stamenova: This line does not build on Windows. Does it build for you?!
} }
lldb::addr_t SymbolFileDWARF::FixupAddress(lldb::addr_t file_addr) { lldb::addr_t SymbolFileDWARF::FixupAddress(lldb::addr_t file_addr) {
SymbolFileDWARFDebugMap *debug_map_symfile = GetDebugMapSymfile(); SymbolFileDWARFDebugMap *debug_map_symfile = GetDebugMapSymfile();
if (debug_map_symfile) if (debug_map_symfile)
return debug_map_symfile->LinkOSOFileAddress(this, file_addr); return debug_map_symfile->LinkOSOFileAddress(this, file_addr);
return file_addr; return file_addr;
} }
▲ Show 20 Lines • Show All 3,151 Lines • Show Last 20 Lines

lldb/test/Shell/SymbolFile/DWARF/function-entries-invalid-addresses.yaml

  • This file was added.
# RUN: split-file %s %t
# RUN: yaml2obj %t/test.yaml > %t/test.obj
#--- checks.lldb-commands
# RUN: %lldb %t/test.obj -b -o "settings set interpreter.stop-command-source-on-error false" -s %t/checks.lldb-commands | FileCheck %s
image lookup -F main
# CHECK-LABEL: image lookup -F main
# CHECK: 1 match found {{.*}}
image lookup -F foo
# CHECK-LABEL: image lookup -F foo
# CHECK-NOT: 1 match found {{.*}}
#--- test.yaml
# int foo() {
# return 1;
# }
#
# int main() {
# return 0;
# }
--- !mach-o
FileHeader:
magic: 0xFEEDFACF
cputype: 0x01000007
cpusubtype: 0x00000003
filetype: 0x0000000A
ncmds: 7
sizeofcmds: 1400
flags: 0x00000000
reserved: 0x00000000
LoadCommands:
- cmd: LC_UUID
cmdsize: 24
uuid: FD292DBF-A309-369B-A588-00E20D0E84CF
- cmd: LC_BUILD_VERSION
cmdsize: 24
platform: 1
minos: 659200
sdk: 659206
ntools: 0
- cmd: LC_SYMTAB
cmdsize: 24
symoff: 4096
nsyms: 3
stroff: 4144
strsize: 33
- cmd: LC_SEGMENT_64
cmdsize: 72
segname: __PAGEZERO
vmaddr: 0
vmsize: 4294967296
fileoff: 0
filesize: 0
maxprot: 0
initprot: 0
nsects: 0
flags: 0
- cmd: LC_SEGMENT_64
cmdsize: 232
segname: __TEXT
vmaddr: 4294967296
vmsize: 16384
fileoff: 0
filesize: 0
maxprot: 5
initprot: 5
nsects: 2
flags: 0
Sections:
- sectname: __text
segname: __TEXT
addr: 0x0000000100003FA0
size: 24
offset: 0x00000000
align: 4
reloff: 0x00000000
nreloc: 0
flags: 0x80000400
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: CFFAEDFE07000001030000000A0000000700000078050000
- sectname: __unwind_info
segname: __TEXT
addr: 0x0000000100003FB8
size: 72
offset: 0x00000000
align: 2
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: CFFAEDFE07000001030000000A000000070000007805000000000000000000001B00000018000000FD292DBFA309369BA58800E20D0E84CF320000001800000001000000000F0A00
- cmd: LC_SEGMENT_64
cmdsize: 72
segname: __LINKEDIT
vmaddr: 4294983680
vmsize: 4096
fileoff: 4096
filesize: 81
maxprot: 1
initprot: 1
nsects: 0
flags: 0
- cmd: LC_SEGMENT_64
cmdsize: 952
segname: __DWARF
vmaddr: 4294987776
vmsize: 4096
fileoff: 8192
filesize: 826
maxprot: 7
initprot: 3
nsects: 6
flags: 0
Sections:
- sectname: __debug_pubnames
segname: __DWARF
addr: 0x0000000100005052
size: 35
offset: 0x00002052
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __debug_pubtypes
segname: __DWARF
addr: 0x0000000100005075
size: 26
offset: 0x00002075
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __debug_aranges
segname: __DWARF
addr: 0x000000010000508F
size: 64
offset: 0x0000208F
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __debug_info
segname: __DWARF
addr: 0x00000001000050CF
size: 108
offset: 0x000020CF
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __debug_abbrev
segname: __DWARF
addr: 0x000000010000513B
size: 66
offset: 0x0000213B
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __debug_str
segname: __DWARF
addr: 0x000000010000517D
size: 206
offset: 0x0000217D
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
LinkEditData:
NameList:
- n_strx: 2
n_type: 0x0F
n_sect: 1
n_desc: 16
n_value: 4294967296
- n_strx: 22
n_type: 0x0F
n_sect: 1
n_desc: 0
n_value: 4294983584
- n_strx: 27
n_type: 0x0F
n_sect: 1
n_desc: 0
n_value: 4294983600
StringTable:
- ''
- ''
- __mh_execute_header
- _foo
- _main
DWARF:
debug_str:
- ''
- 'Apple clang version 12.0.0 (clang-1200.0.32.2)'
- main.c
- '/Applications/Xcode_12.0.0_fb.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
- MacOSX.sdk
- '/Users/aadsm/Projects'
- foo
- main
- int
debug_abbrev:
- ID: 0
Table:
- Code: 0x0000000000000001
Tag: DW_TAG_compile_unit
Children: DW_CHILDREN_yes
Attributes:
- Attribute: DW_AT_producer
Form: DW_FORM_strp
- Attribute: DW_AT_language
Form: DW_FORM_data2
- Attribute: DW_AT_name
Form: DW_FORM_strp
- Attribute: DW_AT_LLVM_sysroot
Form: DW_FORM_strp
- Attribute: DW_AT_APPLE_sdk
Form: DW_FORM_strp
- Attribute: DW_AT_stmt_list
Form: DW_FORM_sec_offset
- Attribute: DW_AT_comp_dir
Form: DW_FORM_strp
- Attribute: DW_AT_APPLE_optimized
Form: DW_FORM_flag_present
- Attribute: DW_AT_low_pc
Form: DW_FORM_addr
- Attribute: DW_AT_high_pc
Form: DW_FORM_data4
- Code: 0x0000000000000002
Tag: DW_TAG_subprogram
Children: DW_CHILDREN_no
Attributes:
- Attribute: DW_AT_low_pc
Form: DW_FORM_addr
- Attribute: DW_AT_high_pc
Form: DW_FORM_data4
- Attribute: DW_AT_frame_base
Form: DW_FORM_exprloc
- Attribute: DW_AT_call_all_calls
Form: DW_FORM_flag_present
- 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
- Attribute: DW_AT_external
Form: DW_FORM_flag_present
- Attribute: DW_AT_APPLE_optimized
Form: DW_FORM_flag_present
- Code: 0x0000000000000003
Tag: DW_TAG_base_type
Children: DW_CHILDREN_no
Attributes:
- Attribute: DW_AT_name
Form: DW_FORM_strp
- Attribute: DW_AT_encoding
Form: DW_FORM_data1
- Attribute: DW_AT_byte_size
Form: DW_FORM_data1
debug_aranges:
- Length: 0x000000000000003C
Version: 2
CuOffset: 0x0000000000000000
AddressSize: 0x08
Descriptors:
- Address: 0x0000000100003FA0
Length: 0x000000000000000B
- Address: 0x0000000100003FB0
Length: 0x0000000000000008
debug_pubnames:
Length: 0x000000000000001F
Version: 2
UnitOffset: 0
UnitSize: 108
Entries:
- DieOffset: 0x00000032
Name: foo
- DieOffset: 0x0000004B
Name: main
debug_pubtypes:
Length: 0x0000000000000016
Version: 2
UnitOffset: 0
UnitSize: 108
Entries:
- DieOffset: 0x00000064
Name: int
debug_info:
- Length: 0x0000000000000068
Version: 4
AbbrevTableID: 0
AbbrOffset: 0x0000000000000000
AddrSize: 8
Entries:
- AbbrCode: 0x00000001
Values:
- Value: 0x0000000000000001
- Value: 0x000000000000000C
- Value: 0x0000000000000030
- Value: 0x0000000000000037
- Value: 0x00000000000000A0
- Value: 0x0000000000000000
- Value: 0x00000000000000AB
- Value: 0x0000000000000001
- Value: 0x0000000100003FA0
- Value: 0x0000000000000018
- AbbrCode: 0x00000002
Values: # DW_TAG_subprogram foo
- Value: 0x0000000000003FA0 # DW_AT_low_pc points to invalid loc
- Value: 0x000000000000000B
- Value: 0x0000000000000001
BlockData: [ 0x56 ]
- Value: 0x0000000000000001
- Value: 0x00000000000000C1
- Value: 0x0000000000000001
- Value: 0x0000000000000001
- Value: 0x0000000000000064
- Value: 0x0000000000000001
- Value: 0x0000000000000001
- AbbrCode: 0x00000002
Values: # DW_TAG_subprogram main
- Value: 0x0000000100003FB0
- Value: 0x0000000000000008
- Value: 0x0000000000000001
BlockData: [ 0x56 ]
- Value: 0x0000000000000001
- Value: 0x00000000000000C5
- Value: 0x0000000000000001
- Value: 0x0000000000000005
- Value: 0x0000000000000064
- Value: 0x0000000000000001
- Value: 0x0000000000000001
- AbbrCode: 0x00000003
Values:
- Value: 0x00000000000000CA
- Value: 0x0000000000000005
- Value: 0x0000000000000004
- AbbrCode: 0x00000000
...